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

Change-Id: I2283b6da53b07da5678c288a78340d4d9dc99e04