Merge "protected android.telephony.action.CARRIER_SIGNAL_RESET broadcast" into sc-dev