[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 3d791e8869 -s ours am: 754de20104 -s ours

am skip reason: Merged-In Ia1a2c370112f75b2a6c1d5836016180ca896c261 with SHA-1 81a5ea0bd1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Mtp/+/15571718

Change-Id: Ie228da9a31c198a5dd33574b7132d63d25dc2421