Merge "Update implementation to match BatteryStats.Uid" into mnc-dr-dev