Merge "Update parsing mechanism for testBatterystatsOutput testcase" into android12-tests-dev