Merge "Merge "Rename requestKeyboardShortcutsHelper" into nyc-dev am: d3439644 am: f76e417c" into nyc-mr1-dev-plus-aosp