Merge "Support different SIM power states" am: 0517b719bc
am: 1bbe5b21f3

Change-Id: I04e071b461a6ccecc46f9fbdc2f4ce6aeb311cb2