[automerger skipped] Merge "Fix setSimCardPower_1_1" into pie-vts-dev am: c1db422723  -s ours
am: 005ba418a1  -s ours

Change-Id: I930716e86c6592b75e38669228bce4a1924a5ff1