Merge "Merge "Add Shortcut API to Settings (1/2) b/28298258" into nyc-mr1-dev...
Merge "Merge "Add Shortcut API to Settings (1/2) b/28298258" into nyc-mr1-dev am: 2cbf71a0" into nyc-mr1-dev-plus-aosp
am: 5ff313c9
* commit '5ff313c9':
Add Shortcut API to Settings (1/2) b/28298258
Change-Id: Ifbb00ca50874d731319f6c34287f5440936b2586