Merge "Fix BatteryService enum inconsistent with BatteryManager" into main am: 5905aa30cf am: 19f0b98a21

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2982984

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