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

Change-Id: I5831a66dcbf8c6097527cade18b0e7afda8bdd7b