Merge "Propagate calling UID to AM from LauncherApps" into pi-dev
am: eac8a05d19

Change-Id: I0c9bfeb58bd51954f9ec11944ad20e996e1caa8f