Merge "Support different SIM power states" am: a908a78861 am: 3b40bbea9b am: 4e19d1bea9
am: 421ce63340  -s ours

Change-Id: I60beff852078562d562c978ed55778c557dc77d9