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

Change-Id: If9f5692cd0bce73e2323db2b051f40973641a225