Merge "Ref count isolated uid usage in BatteryStats" into sc-qpr1-dev