[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: 1b62fd01 -s ours am: 6911c211 -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/+/14992068

Change-Id: I265975286348a438a1a7402068507464fecdedf3