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

* commit '031bbef57e7d8e18b238bac4e3e7c356b0055655':
  Update implementation to match BatteryStats.Uid