[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: 1226602095 -s ours

am skip reason: Merged-In I57bbf91eb9ce9c35a103cfc54f9a6f2002eba54a with SHA-1 a42bff7938 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/30283917

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