Merge "Fix test case for setSimCardPower radio api." am: 6287508ad3 am: 234940252b am: b93cc647e1  -s ours
am: dcc8a027f5  -s ours

Change-Id: Ia738282cf0fb520d0125beb54399a76a2402e44f