[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: a31244de63 -s ours am: d76c908611 -s ours

am skip reason: Change-Id Iecb2bcd86762e94b0f881314630660a84070ca16 with SHA-1 aee611fb1c is in history

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

Change-Id: I00815cc03f04352b90c44dd5411fbfcd0b79f9b7