Merge "Initialize uninitialized member in BatteryService" into udc-dev am:...

Merge "Initialize uninitialized member in BatteryService" into udc-dev am: fe46a177 am: dacee579

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



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