[automerger skipped] Merge "Fix setSimCardPower_1_1" am: 268dee8d0f
am: 3e8f679634  -s ours

Change-Id: I34a876cec3953b7dd0e5f40fc3fce9fd51100dde