Merge \\\\"Fix: updateExternalState() does not update SIM state to...
Merge \\\\"Fix: updateExternalState() does not update SIM state to PERM_DISABLED\\\\" am: 6a7fad75 am: 213dd8bd am: bc2d1292
am: b9715222
Change-Id: I6255b4ee7f5bf385c41b263f42dc88d8443700f0