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

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

Change-Id: I8840fba9cf1e69ddd6b8659ab512e7c13b19baec