Merge "Propagate calling UID to AM from CrossProfileApps" into pi-dev
am: 7bfb942e2d

Change-Id: Id064e40dd38100f25936d0c977f6018c560c0076