[automerger skipped] Merge 24Q3 to AOSP main am: b6f7a2a2e2 -s ours am: f2732980a7 -s ours

am skip reason: Merged-In Iffe880b97e0296047b9e2b9c9929d67d09d257b6 with SHA-1 ac3a513033 is already in history

Original change: https://android-review.googlesource.com/c/device/google/raviole/+/3257839

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