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

Change-Id: I863db2eba349aa9625c00dec0ae5e91f266d371a