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