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

am skip reason: Change-Id I6aafd36e9614cad20ad4c26d899f280cc1878e84 with SHA-1 a2d66c5f84 is in history

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

Change-Id: I5e5b8b2a464a0065e61e2d0bf6d836364f0effa9