Merge "Patch for setSimCardPower_1_1"
am: b4e998e812

Change-Id: Id4569de7a4f643be6437b8d05e3d9ec9e40dc278