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

Change-Id: I3c1d47b97d39bb2e1f1a7e3639375251b69110a6