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

Change-Id: I46d59374c28c313ad9af116ce75709386a1c3d9f