Merge "Merge "Rename requestKeyboardShortcutsHelper" into nyc-dev am: d34396443e am: f76e417c52" into nyc-mr1-dev-plus-aosp
am: 898d0a9907

* commit '898d0a990704ef24aa1da4a7a09a6cf4ff35faf4':

Change-Id: Iee45624033f882fd3bc6573c8abdfa8f83912db5