Merge "Don't break key event stream when enabling a11y" into oc-dev
am: bb8a7983ff

Change-Id: I5deb45f1e2b2c0f667c5a37e70cdabe643f905ee