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

Change-Id: If915a2f89d0d86df2867273aff4acc3301128ad7