[automerger skipped] Merge "Revert "MTP: add a new parameter for cancelEvents...

[automerger skipped] Merge "Revert "MTP: add a new parameter for cancelEvents function"" into sc-dev am: d828b8f1 am: 10e9b7db -s ours am: 22b0e757 -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: I76e6cfc0c77ce8b3916a5495c9ce965377b5fa75