[automerger skipped] Merge Android R am: 9a3581ccec -s ours am: a0c8263eee -s ours am: 67113da08b -s ours am: 7f87ef5555 -s ours

am skip reason: Change-Id Ie91fd6a281f5e9ccb814a86ab1b18ea44564d427 with SHA-1 be2900434e is in history

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

Change-Id: Ie0db3d9fbc233c652d57d524ab2f0d5885d752e0