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

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

Change-Id: Ib8af566184a33a3469d8c0c226a6acd9d284568e