am 96111ddf: Merge "SimulatdDpad: fix NPE for event without device" into jb-mr1-aah-dev

# Via Android (Google) Code Review (1) and Dake Gu (1)
* commit '96111ddff7af61ce37fa8d9020d8e1eeba9095e8':
  SimulatdDpad: fix NPE for event without device