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

Change-Id: Id5a79c51d80659a26627223def4a443da46d42be