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

Change-Id: I5a6fe8947017b7a8b3cfdf41c4b5583dc114bf44