Merge "ShortcutManager: Update foreground check." into nyc-mr1-dev
am: 0fd8670fd5

Change-Id: Ice27469c4ac8e8338412fd7c2aa703d28c82a407