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

Change-Id: Ib8fbfab25589e0de0b301f45b3c98d3ee592866a