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

am skip reason: Change-Id Ia6bb481d2cc9e14976aab45042881f277d6763ca with SHA-1 643b460fb6 is in history

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

Change-Id: I81d4becf9413f843a02d608300ad5714ee3d01d4