Merge "Merge "health: BatteryService etc. use health AIDL HAL" am: 104adeeb am: 2cbfa143 am: b7b98179 am: 7a6c6d2a"