Merge "healthd: BatteryMonitor: Fix compiler warning"