Merge "Merge "Add null check to KeyEventDispatcher." into nyc-mr1-dev am: 49b684d562 am: b126ddb917" into nyc-mr1-dev-plus-aosp