[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: d5cb7000d9 -s ours am: 0851f1cf19 -s ours am: 13c51f1224 -s ours am: a11f190bd0 -s ours

am skip reason: Change-Id I545154cab8f65af44a7cca79b1ac81585c610681 with SHA-1 8b91799696 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/build-tools/+/12469964

Change-Id: Iebc850e393c25d63cd75b90ada348a0e3f1f1600