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