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

Original change: https://android-review.googlesource.com/c/platform/cts/+/2137856

Change-Id: I35a15157aa844040c6fc1c909a392c8661115155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>