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