Merge "Updating allowed keymaster versions" am: 24103c8d79

Original change: https://android-review.googlesource.com/c/platform/cts/+/1349803

Change-Id: I85bae4aa7422e095789439c21bcd3d459cda9685
(cherry picked from commit bbbaa315423a8ea2100a0c03c32190354d0010c2)

Bug: 163336591
Change-Id: I85bae4aa7422e095789439c21bcd3d459cda9685
1 file changed