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

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

Change-Id: Ibb2aeedf0e05fb70936bd0583bcfbad5f3664cb1