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 am: c6abcbab am: 14b97847

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

Change-Id: I244187660c73de4705ad311fe796e6d3ddef779a