[automerger skipped] DO NOT MERGE - Merge Android 13 am: 1ab1c1d7c8 -s ours am: b38b4d3dbd -s ours am: 011ad7561d -s ours

am skip reason: Merged-In Ia6d2d8e4d7f4e3c98d55767ab7c094fcbeb62d76 with SHA-1 5d827f2e69 is already in history

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

Change-Id: Ic6f5e4b5f5abc768da7775aa545b36e5cdcfd213
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>