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

Change-Id: I9fca5e1ff1d3945a147ab53f3d4d76287123113b