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

Change-Id: Icb6db4d805b4aea701a803eaaec716954f2ebf2a