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: e97641e8
Original change: undetermined
Change-Id: Ie3e517931efe14f83ad76c58e235228f92835279