Merge "health: BatteryService etc. use health AIDL HAL" am: 104adeeb75

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

Change-Id: Icd85791dc6b57f8993f500306ed1e7a9f86fd218