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

Change-Id: I180bcd22beabc4d32cb8ba43707acdd5d14ade9a