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

Change-Id: If002ec36dfa98c5699b5f6270eb60e22b1dffa87