[automerger skipped] Add resolveActivityAsUserForExplicitType api to pm am:...

[automerger skipped] Add resolveActivityAsUserForExplicitType api to pm am: e80fafa7 -s ours am: 6e523865 -s ours

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

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



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