Merge "DO NOT MERGE - Merge ab/7272582" am: 811d45934f

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

Change-Id: I568ea8e501dfdc1fe6741f6055aebefbc9ba419a