am 0896a2e5: am 65477c80: am 031bbef5: Merge "Update implementation to match BatteryStats.Uid" into mnc-dr-dev

* commit '0896a2e545f88785c2a07a4de91d4f5ea67c1a57':
  Update implementation to match BatteryStats.Uid