Merge "KeyMint VTS: check INCLUDE_UNIQUE_ID works" am: 1e3d97de43 am: 010a23aa0d

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

Change-Id: I5e455def037ffedde1b8b5e82eef558798de4146