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

Change-Id: Ibe7ddd22aab8fe06e13f12352a6c354d77bd06f1