[automerger skipped] Merge "Revert "MTP: add a new parameter for cancelEvents function"" into sc-dev am: d828b8f1 am: 009bbe81 -s ours

am skip reason: Merged-In I4e172fa62c297ac33b0c97c67f3f7baa817fd8bf with SHA-1 305e62ec is already in history. Merged-In was found from reverted change.

Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/14910151

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/14966817

Change-Id: I47d61b79d25316b675c49f5ee005cb2a2b9f0b70