[automerger skipped] Merge "Add resolveActivityAsUserForExplicitType api to...

[automerger skipped] Merge "Add resolveActivityAsUserForExplicitType api to pm" into udc-qpr-dev am: 9f75bf36 -s ours

am skip reason: Merged-In I8453f25ed5ddd938718f4d2be4983c881778f281 with SHA-1 57233409 is already in history

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



Change-Id: I5c3a0e9e1872738c273a15b53aa3bd2f5e7c5ae9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>