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