Merge "protected CARRIER_SIGNAL_RESET broadcast" into oc-dev
am: af7a9eb530

Change-Id: I118ebfd5e9207c2a27294e48c99b3c0b4c478bad