Merge "protected CARRIER_SIGNAL_RESET broadcast"
am: 30a7397bcc

Change-Id: Ie1859f0415ebfb49a8b5385695f2e4e85e306513