Merge "Merge "Set calling user as intent extra to indicate intent resolver...

Merge "Merge "Set calling user as intent extra to indicate intent resolver edge case" into rvc-dev am: c235831a am: c6abcbab" into rvc-d1-dev-plus-aosp am: 2d8e2673

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

Change-Id: Ia225e8d8794fb9c5f1c2f30ee9338035020e2787