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

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

Change-Id: I0f545941c55de167f92495ef5b9635ad2d204dc8