Merge \"ShortcutManager: Make sure persisted default launcher still exists.\" into nyc-mr1-dev
am: 5b080d4e90

Change-Id: I8f1db21f5372a23b6584c1275aa0a2ee6edadb53