Merge "Link static version of KeyMint lib in VTS tests" am: c3177488e9 am: d1ebed1d58

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

Change-Id: Ib609a0757d4d60b41c6c81b6926589e42c9789d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>