Merge "Merge "Clear events when ACTION_CANCEL is present" into qt-dev am: cdf3e2905a am: 5ecf5b0340" into qt-r1-dev-plus-aosp
am: bd42b2f521

Change-Id: I2fab7a2281e161bbc5bbaa5b75a6d4231e2b0616