Merge "KeyMint VTS: extra unique ID test" am: 7a5b3d062d am: 3a539327e3 am: f103c76afe

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1877242

Change-Id: I9a74b473efe18dcb8283f4e2abd805b37d188278