[automerger skipped] Merge "DO NOT MERGE: Fix incorrect use of...

[automerger skipped] Merge "DO NOT MERGE: Fix incorrect use of UserHandle#getUserHandleForUid(int uid)" into rvc-qpr-dev am: 6b771b65 am: 92d0b430 -s ours

am skip reason: subject contains skip directive

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

Change-Id: If1c98d4abb386daa87930ace7d0c3e972386ff19