Merge "Fix KM VTS tests for Strongbox implementations" into pie-vts-dev am: c08c73653a am: 34986e08dc am: 4da4c737bc
am: ab85387167

Change-Id: Ib0a764db1cd7e00bc5bbe474cb699bb4b282048b