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

[automerger skipped] Merge "Add resolveActivityAsUserForExplicitType api to pm" into tm-dev am: 4c97f3f5 am: fdb8925a -s ours

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

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



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