Merge "ShortcutManager: rescan all apps after next OTA" into nyc-mr1-dev am: f77b6620d1 am: f58bd641f1
am: ded6dd050c

Change-Id: I9c0f7766c414cf2ee12e5be25906add6cc0274ea