Merge "Merge "ShortcutManager: Break down unit tests" into nyc-mr1-dev am: f6be4c023f" into nyc-mr1-dev-plus-aosp
am: 7d9b79c41b

* commit '7d9b79c41b53a8f936cb50be40c57a13412197bb':
  ShortcutManager: Break down unit tests

Change-Id: If4e742401c1fa02f48d086f9cbdf50d8100e4f16