[automerger skipped] Merge "Ref count isolated uid usage in BatteryStats" into sc-qpr1-dev am: b85b750561 am: 493f8b0569 am: c9cde5e755 -s ours

am skip reason: Merged-In I5e51f5f90191829d12fb080169520d9827b9906c with SHA-1 83c0928c34 is already in history

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

Change-Id: I2e681110b6cb4290624eac08522eedaa2febb9f9