Merge "Support different SIM power states" am: a908a78861 am: 3b40bbea9b
am: 4e19d1bea9

Change-Id: I7a2c52cd19b39307fa5e27b2d7b13d7aa54447a4