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

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

Change-Id: Ifeeb05aacc479fd2f3af49e7b28fbe7a26d021b4