Merge "Patch for setSimCardPower_1_1" am: b4e998e812
am: 8cb970894d

Change-Id: Ic4e641a9e0c12a2ffb95745924acd9f6f90b476c