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

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

Change-Id: I9799af5c481e2cef5ff7d094c244fb4a7d7711c3