Merge "protected CARRIER_SIGNAL_RESET broadcast" am: 30a7397bcc
am: 75765290ea

Change-Id: I402fbccead7900e0ec76f66fa560ade8a10e2a13