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

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

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