[automerger skipped] MTP: add a new parameter for cancelEvents function am:...

[automerger skipped] MTP: add a new parameter for cancelEvents function am: 39a21d0d -s ours am: 09baee34 -s ours

am skip reason: Merged-In I8a2097e40feaa880de1d57921f5363eb98dbeb44 with SHA-1 bd3a649f is already in history

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

Change-Id: Id05b05ec9af8bd09a5f31a0bf4c880c64a135142