[automerger skipped] Merge 24Q3 to AOSP main am: b6d385ab0a -s ours am: 51375ede9d -s ours

am skip reason: Merged-In I34dfb8901c549d821ae47aa2e4c1953f83e5514f with SHA-1 c3b4b1f971 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/multidex/+/3258018

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