[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 23655852ba -s ours am: 507c94c484 -s ours am: f9a085281b -s ours am: a9c6ae8154 -s ours

am skip reason: Merged-In I027bcb6d53f721a7f7bb36ba005372f69b0560f9 with SHA-1 eb1107a915 is already in history

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

Change-Id: I5e393f24d93046befd8fb2c6cf7dd4ddca694a5b