Merge "Support different SIM power states" am: f94eb06d32 am: b6e91f51f6
am: 22facb038d

Change-Id: Ib45036bead4fe35323f39fa7fa9bc882b73dd0de