Merge "Merge "Update parsing mechanism for testBatterystatsOutput testcase" into android12-tests-dev am: 7fd66c6e79" into android12L-tests-dev