[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 am: 839f974c am: 6ba5ff05 -s ours am: cb54af22 -s ours

am skip reason: Change-Id I88c33a48a627008f5ad7f880bd09c568866b1c5b with SHA-1 26f7f620 is in history

Change-Id: I812db282eab945f5cc561c847154b7f2a8c42efa