[automerger skipped] Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future am: 8ecaf331cd -s ours

am skip reason: Merged-In I1051ed664b1f3cbb2409664a168cc115d75308e1 with SHA-1 689338b9c7 is already in history

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

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