[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 0ff7dc3712 -s ours am: 021a3bcb36 -s ours

am skip reason: Merged-In I2e8533a0dbb751311d7af654bd04207ce0a5aef2 with SHA-1 0ee098fad1 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/sonivox/+/3256347

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