Merge "Fix small typo in ShortcutManager header docs" into nyc-mr1-dev
am: aea27e1aea

Change-Id: I2e2f4d46787c51617b486edb7774cdf18bcaf52f