[automerger skipped] Merge 24Q4 into AOSP main am: faef291f4c -s ours

am skip reason: Merged-In I56f0139c748a3a04df9f3998653121948846c8fe with SHA-1 7c1f13c5a9 is already in history

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

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