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: a27b4877 am: f4a3a6aa
Original change: undetermined
Change-Id: I3b4a6ee4a1a83ce8b89e47adf8d2ed41b4649923