Merge \"Merge \\"Shortcut Manager: Address API council feedback and fix...
Merge \"Merge \\"Shortcut Manager: Address API council feedback and fix TODOs\\" into nyc-mr1-dev am: 3c67b3e4\" into nyc-mr1-dev-plus-aosp
am: 24c52732
Change-Id: Ib54aff79c823b6819d94ef0ef6194e4541bf734f