[automerger skipped] Merge 24Q3 to AOSP main am: cb2d744c4f -s ours am: 5623543adf -s ours

am skip reason: Merged-In Ia5f14b6fac52940a9a6e17e3aa75e729dabea092 with SHA-1 ee0af0a0e2 is already in history

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

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