[automerger skipped] Merge "Merge Android 12 QPR1" am: 2766181404 -s ours am: 2ae1ac7392 -s ours am: 2b72f9ff1b -s ours

am skip reason: Merged-In I931120e34f83ca3f667d94d1cf09659908b41463 with SHA-1 5d3e1c5fe6 is already in history

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

Change-Id: I1a636b13007cb98bb766185b140601ec1594a451