[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make WPMS look for DOs and...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make WPMS look for DOs and POs in the correct calling user" into rvc-qpr-dev am: b8e8fe89 am: dd68beb9 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4f4f8b07e8ecbf35c9edb438afd5edb119ec3f11