[automerger skipped] DO NOT MERGE - Merge Android 13 am: c7858204da -s ours am: 40dfebabcb -s ours am: 2b3140fd90 -s ours am: 08c4a9b447 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iff195fc0258ca6e61f317da1fdca87b0b5f65e17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>