[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: ad8df18ae1 -s ours am: 3895c270a6 -s ours am: ffbb8e3ad0 -s ours

am skip reason: Change-Id I5df385e0748a3a4020ddfabb907681904ccbdc27 with SHA-1 2e97b09868 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/compatibility/cdd/+/12469795

Change-Id: I8369f51d1140cbaec9350d71933ab745bd4e3d0c