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

* commit '65477c800fabbce6586bc2782ce56167e0bd2734':
  Update implementation to match BatteryStats.Uid