Merge "Ref count isolated uid usage in BatteryStats"