[automerger skipped] Merge "Ref count isolated uid use for long partial...

[automerger skipped] Merge "Ref count isolated uid use for long partial wakelocks" into sc-v2-dev am: b1b7910f -s ours am: 11e259c9 -s ours

am skip reason: Merged-In I86456137e6d6ad47f9974da281defc04d20fb32f with SHA-1 f548942f is already in history

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

Change-Id: Ib231db0f45e4d4af39b779859c6e3bc09a2ad684