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

Change-Id: Iee77b290f446423624b83526e332b668e358256a