Merge "[REFACTOR] health 2.0: BatteryMonitor::update split into 3 funcs" am: 17fad82187 am: 7970a4ad28 am: 7ae63ccdfd
am: 2cf3301744

Change-Id: I38653f5c3d0de6d3c49566590be87f062d11aa01