Merge "Merge "ShortcutManager: Break down unit tests" into nyc-mr1-dev am:...
Merge "Merge "ShortcutManager: Break down unit tests" into nyc-mr1-dev am: f6be4c02" into nyc-mr1-dev-plus-aosp
am: 7d9b79c4
* commit '7d9b79c4':
ShortcutManager: Break down unit tests
Change-Id: If4e742401c1fa02f48d086f9cbdf50d8100e4f16