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

Change-Id: I66903a9ed80036a8d1f2050fc631d7c239fe11f5