Merge "Support different SIM power states"
am: a908a78861

Change-Id: I7556a6079d03a847a02377154ab7277e4ce128c0