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

am skip reason: Change-Id I011de9865ebcecc37d325c769a357546abe02487 with SHA-1 a42f9088a4 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/compile/slang/+/12469983

Change-Id: I6c5d9510b6b876a5605e2cec90572fff44e416c1