am 9aae8d9c: am c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev

* commit '9aae8d9c1b2219f9d98ac07b1fe04ef62c4cacb9':
  BatteryStats: Use proper power calculator when energy data is received