[automerger skipped] Add ID to InputEvent. am: c8362b24 am: 323e664b am:...
[automerger skipped] Add ID to InputEvent. am: c8362b24 am: 323e664b am: 3435f8be am: 2df28295 -s ours
am skip reason: Change-Id Icbdcaee1d98948c05484865a4e15e55161ecfa69 with SHA-1 29d21d40 is in history
Change-Id: Idad0d617851ac185f782fb744eaa217a9bb4106e