Merge "KeyMint VTS: check INCLUDE_UNIQUE_ID works"