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 am: afc55e67

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

Change-Id: Ib724e2bf164c1bb37d31dc7d1eabad78f6573fd1