[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: d5cb7000d9 -s ours am: 0851f1cf19 -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: Ia5e01e5afc2b71a996cad2950db799c1274025d5