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