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

Change-Id: I0e796089c9768ddd8de1c371f0511d7967833e9d