[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: cc565d9013 -s ours

am skip reason: Change-Id I0d3037d036bf34db403accd5f296df5381c4ec34 with SHA-1 beeebec34d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0c5710a17d08eacd3b140a578804224c3e3ccba3