Merge "Fix sanitizer in InputFlinger Reader/Dispatcher." am: bfdea369b7 am: b899c4c281
am: 67d21a8323  -s ours

Change-Id: If8c55f3ba09ffb498b21f35e075e463e7abeb8b1