Refactor UserEventDispatcher (1/2) b/28269657
am: aa95365

* commit 'aa953654279d7cca29682d85111e398ea1f20390':
  Refactor UserEventDispatcher (1/2) b/28269657

Change-Id: I33e1d3c59fb8368a8cfe52b8132d64b33813716f