Merge "Merge "ShortcutManager: finishing touches" into nyc-dev am: 7d164d35a4 am: 96ef96b563" into nyc-mr1-dev-plus-aosp