Merge "Add UserHandle to ShortcutInfo, and simplify LauncherApps APIs." into nyc-dev