Merge "MTP: enable new cancel behavior in short packet handling" into sc-dev am: f8f01ad3e5 am: 624b46a9a9 am: ea0d6a69ed

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

Change-Id: Ia2c4664f903d32a60c7abcee249a710758ebaaaa