[automerger skipped] Merge Android 14 am: bcdb5993c6 -s ours am: 0ddf385f90 -s ours

am skip reason: Merged-In I397feac5306df2ef102f9974b22d7ab5ed434c5b with SHA-1 2f9fcc4d3c is already in history

Original change: https://android-review.googlesource.com/c/device/generic/armv7-a-neon/+/2775022

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