Merge "protected CARRIER_SIGNAL_RESET broadcast" am: 30a7397bcc am: 75765290ea am: 91d54a5ebf  -s ours
am: 13d3ff3a85

Change-Id: Ib9ee9c67372374f11269e0f13b1037dfe6508454