[automerger skipped] Merge Android 14 QPR3 to AOSP main am: c2be237ec2 -s ours

am skip reason: Merged-In I2defea8cb7d925c684396961b918f80e76015def with SHA-1 34b1b6474f is already in history

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

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