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

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

Change-Id: I5ad9cee8ea7666afcbe5431eab592c3855d4b626