Merge "Fix batteryLevel CTS test" into pie-cts-dev am: 049644926e

Change-Id: I2574ed7ef5b0dda1521b0af3a4258d698bd8d443