[automerger skipped] Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future am: 7db6883ca1 -s ours

am skip reason: Merged-In I9b06e66f953b9f7a617634cbcc0ff8e5528b940b with SHA-1 e414c188f1 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/ndkports/+/27145169

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