Merge "ATV a11y shortcut (CL 1 of 3): Update key chord" into oc-mr1-dev
am: 9174e87722

Change-Id: I1afc6fc7cc2faa929dd343b8cb9caead024e6dc1