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

Change-Id: Ibfbb5cda126bdeaa2d806eb3315a749772765287