[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 76858887c4 -s ours am: e1ac9d669a -s ours

am skip reason: Merged-In I61ac054c32525b8509baafd70840fbed0f1ab7c4 with SHA-1 196cde7bf2 is already in history

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

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