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