Merge "Only add user id to content uri if launching cross-profile target" into...
Merge "Only add user id to content uri if launching cross-profile target" into rvc-dev am: 6d5e349b am: 0cc60867
Original change: undetermined
Change-Id: If2ae5a93f45abc390c68bd9244bbf54802f9a820