[automerger skipped] Patch for setSimCardPower_1_1 am: a8b8b6b1b3
am: 269e1cceac  -s ours

Change-Id: I3643c9bb49af3c970eb4f4a53c06e72d53265f16