DO NOT MERGE - Merge RQ1A.201205.011 am: beeebec34d

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

Change-Id: I51f940cfeef46d06cf57352149b509ce9d69586f