[automerger skipped] Merge Android R am: 64d35027c2 -s ours

am skip reason: Change-Id I8c5ee0f658f8387fecfef7c4d977fa12e094d3ae with SHA-1 64adb6f7f8 is in history

Original change: https://android-review.googlesource.com/c/platform/external/libopus/+/1421756

Change-Id: I527977ad0d8c0b11620d556fa63f26977711513e