Merge "DO NOT MERGE: Fix incorrect use of UserHandle#getUserHandleForUid(int uid)" into rvc-qpr-dev am: 6b771b656a

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

Change-Id: I13f431bff7cf9f11cb044723067a379435c91062