[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 81735a7ca5 -s ours am: ec6123be72 -s ours am: 612edf0044 -s ours

am skip reason: Change-Id I8016529dfaf6109d2a7b092de18b78c50131b959 with SHA-1 cb25028daa is in history

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

Change-Id: I774a9a6ad592119d3c34c8fe7e9fc3d64a9ca80b