[automerger skipped] [RESTRICT AUTOMERGE] Make WPMS look for DOs and POs in the correct calling user am: 72704403 am: fb688b44 -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: I74547f389c1fc1f39c82cd27065692296ee58420