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