[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 6dff0bf7f9 -s ours

am skip reason: Merged-In I9b7f095629de809df326abb8cc5e55efbd36c05b with SHA-1 61448c38bf is already in history

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

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