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

am skip reason: Merged-In Ib30c4c4b0af44139183f5ada4a8dfed8db2cc4c6 with SHA-1 ee8f5ffd3e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NeuralNetworks/+/27273911

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