Merge "ShortcutManager: When app\'s data is cleared, remove all shortcuts,"...
Merge "ShortcutManager: When app\'s data is cleared, remove all shortcuts," into nyc-dev am: d1c30db5
am: 16d4eadb
* commit '16d4eadb':
Change-Id: If198ff1e6444ab39ddc44858c4e37be631dc37f7