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

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

Change-Id: I2274f00f21ac1af60e7b9c4508a54282e6a06d2e