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: I6eb80336c52e2046180802d6813c7e9dafb92e47