Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev am: a23cd4614f
am: 446e5a536e
* commit '446e5a536edeef02fa976898b2eca85b22296509':
Change-Id: I448140791a788716893324ebae10adbead984f79
This commit is contained in: