[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: e1df04d400 -s ours am: b87faa2e64 -s ours am: 957d50d329 -s ours am: 48963c4cf3 -s ours am: b6b787af8c -s ours

am skip reason: Change-Id I7a1807955dcffb30deedcd3c864351aafdd74468 with SHA-1 d74e89f967 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/compiler-rt/+/12469773

Change-Id: I7220f25f38cc5c3cbf7b6221507851b97fa6d3b0