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

[automerger skipped] Merge "Add resolveActivityAsUserForExplicitType api to pm" into udc-dev am: a52236f9 am: 95764739 -s ours am: 3addf8bc -s ours

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

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



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