Merge "Fix lost query sim status in UiccController when device is...
Merge "Fix lost query sim status in UiccController when device is unencrypted." am: 39443c82 am: 1723f4d7 am: 60780ab6
am: cb32902b
Change-Id: Ic6605a6da6f9564c6ed8b4f065ca0e66ea14afd0