Merge "Merge "Don't break key event stream when enabling a11y" into oc-dev am: bb8a7983 am: aec87eab" into oc-dr1-dev-plus-aosp