Merge "Update FakeUid to match new methods in BatteryStats.Uid interface"