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