Merge "Reinstate owners for BatteryServiceTest." into main am: 0bd03508 am: bbf8fee0 am: 87140944

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2882953



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