Merge "Support different SIM power states" am: a908a78861
am: 3b40bbea9b

Change-Id: I78a230bea7c495b8b09e42ce2b9d14f0f3328ac7