Snap for 8590907 from 97f70ed81db9d903cedd3d900d176aa16fc1241d to tm-release am: b94c4aac9e

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

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