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

am skip reason: subject contains skip directive

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

Change-Id: I6e0f4fa5902b654b32b3d8d48536e698cfefc749
Signed-off-by: Automerger Merge Worker <[email protected]>