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

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

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



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