Merge "Fix default for a11y shortcut setting" into oc-dev am: 5ef1135b9f
am: bffd5636ff

Change-Id: I37e5b5651d3f1930791acf013bce10f9e5cb50ce