am 11d4ab2d: Merge "Change to register for SIM_STATE or RADIO_STATE updates...
am 11d4ab2d: Merge "Change to register for SIM_STATE or RADIO_STATE updates only if device is decrypted." into lmp-mr1-dev
* commit '11d4ab2d':
Change to register for SIM_STATE or RADIO_STATE updates only if device is decrypted.