[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 2738924fcd -s ours am: 44ed2c0458 -s ours am: 78d505d154 -s ours

am skip reason: Change-Id I8749655bfbaf4d30f5ddfcba35d0eff2a66ec991 with SHA-1 a0e857181e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/checkstyle/+/12470199

Change-Id: I975fb1a9d462ed2a5c7fe2f8c3d771921e628497