Merge changes from topic "merge-unique-id-tests" into sc-v2-dev

* changes:
  KeyMint VTS: extra unique ID test
  KeyMint VTS: check INCLUDE_UNIQUE_ID works