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

* commit '390a81302f13a0285e58e550cf786255ce5f8bd8':
  Add UserHandle to ShortcutInfo, and simplify LauncherApps APIs.

Change-Id: Ice1ba7818ca5da2da91d0cf1a3bc2baace82c7e8