Merge "Fix batteryLevel CTS test" into pie-cts-dev