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 am: c80bb1f3 am: 5cf58a5e
Original change: undetermined
Change-Id: Ide4287374801d6e81906a4a06339196d590e6d43