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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15756344

Change-Id: I6998822dfe23a513d5c52a0c931bb906eb6d59b2