California lawmakers approve highly contested new data privacy rules, staving off a November ballot initaitve