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

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

Change-Id: If46fad4d1d60e7c2465e671c188cc2e22385b808