Merge "healthd: BatteryMonitor: Fix compiler warning" am: abd6627983
am: 1e911b7dc8

Change-Id: I6c916c9370660a04d8f52579907175e211266502