[automerger skipped] Merge "Add a ShimUtils.isAtLeastR() and use it in tests."...
[automerger skipped] Merge "Add a ShimUtils.isAtLeastR() and use it in tests." into rvc-dev am: 7dd51c66 am: c041bf13 -s ours
am skip reason: Change-Id I88c33a48a627008f5ad7f880bd09c568866b1c5b with SHA-1 0d08b449 is in history
Change-Id: I4fefbfdebacdac024ec2e0afa3bb6109a7920c63