Merge "ShortcutManager: Clean up for uninstalled packages." into nyc-dev
am: da70ee4

* commit 'da70ee48e6c3fedb3e8c824e28612ff42e01ff12':
  ShortcutManager: Clean up for uninstalled packages.