[automerger skipped] Merge "Merge Android 12" am: 3971322857 -s ours am: 39e7199203 -s ours am: f028b52c6b -s ours am: 769b5dc50d -s ours

am skip reason: Merged-In I05e4aa3a0ce2a4412547246cfe28841bd54aac4c with SHA-1 23655852ba is already in history

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

Change-Id: I249c1132de97dbc43cc3d9b5c453f04c35dab267