[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" am: 811d45934f am: 3fa2dcc45b am: 1bea5a21d1 -s ours am: e4cb655923 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5b4f19e72713e3c9f797230808953115d51bcfd1