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

Merge "Set calling user as intent extra to indicate intent resolver edge case" into rvc-dev am: c235831a

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

Change-Id: Ie628f4565763199c22103bd1f47922f3df70893c