Merge "Merge "Only add user id to content uri if launching cross-profile...
Merge "Merge "Only add user id to content uri if launching cross-profile target" into rvc-dev am: 6d5e349b am: 0cc60867 am: e97641e8" into rvc-qpr-dev-plus-aosp am: 4709b924
Original change: undetermined
Change-Id: Iae71803f9eaf6d926cbdacc612549965f36653f9