[automerger skipped] Merge "Merge Android R" am: 15d5212fcf -s ours am: f48137dbb0 -s ours

am skip reason: Change-Id Idc7ddb63acda5e6fdea80145bb479a6aff369e70 with SHA-1 9546d1c9a8 is in history

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

Change-Id: I527d6517fc27887197ef00866c94e5d7db2fdb4f