Merge "Support different SIM power states" am: f94eb06d32 am: b6e91f51f6 am: 22facb038d
am: a442f2873f  -s ours

Change-Id: I34bb5526fc8800431e1562c12f0a444163475349