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

Change-Id: I13f9f69f708d34e64782593c2e4846f57e9a33b4