Merge "Update FakeUid interface to match BatteryStats.Uid"