Merge "ShortcutManager: Break down unit tests" into nyc-mr1-dev
am: f6be4c023f

* commit 'f6be4c023fbd29d14fdd0b8df6b939b8a46cf553':
  ShortcutManager: Break down unit tests

Change-Id: I31bb7fb30e4de121447acbe1ec5915cde6ae4f7f