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

[automerger skipped] Merge "MTP: add a new parameter for cancelEvents function" into sc-dev am: b68d0515 am: 6996cf25 -s ours am: d2fc5c69 -s ours

am skip reason: Merged-In I4e172fa62c297ac33b0c97c67f3f7baa817fd8bf with SHA-1 c24226c9 is already in history

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

Change-Id: I90a02d754fca2560929d96cb328a3b98af17a63c