Merge "Add a ShimUtils.isAtLeastR() and use it in tests." am: 690a6e2b am:...
Merge "Add a ShimUtils.isAtLeastR() and use it in tests." am: 690a6e2b am: c77718f6 am: a8e88e25 am: a7099888 am: c76a712f
Change-Id: I2581881b66dcee0cdd488b9643c15a33e860e5e2