DO NOT MERGE - Merge ab/7272582 am: 78d14e19bc

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

Change-Id: Ic42e7a684c1c029b1cd35ecd0c12715a654c0d82