[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: 8788c676 -s ours am: afd12c4d -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: If33fc35e450c7d4d4451cfbb3420f9fb28424ea1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>