Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 34b1b6474f

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

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