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

Change-Id: I79814ed34edfc0a80651f2412be39dacd243b761