Merge "Add null check to KeyEventDispatcher. am: 2a0e48aaf5 am: 2aab159e33" into nyc-mr1-dev-plus-aosp