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

[automerger skipped] Merge "Add resolveActivityAsUserForExplicitType api to pm" into tm-qpr-dev am: 384b70d4 -s ours am: e9a02cf8 -s ours am: 24274f3a -s ours am: 4fd714f1 -s ours

am skip reason: skipped by olit

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



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