[automerger skipped] Merge "Merge "Ref count isolated uid usage in...

[automerger skipped] Merge "Merge "Ref count isolated uid usage in BatteryStats" into sc-qpr1-dev am: b85b7505 am: 04dcc9e5" into sc-v2-dev-plus-aosp am: 3faf5ff0 -s ours

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

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

Change-Id: Ib287325b272c59996a0f7f5d00007671d31598d9