Merge "Fix KM VTS tests for Strongbox implementations" into pie-vts-dev am: c08c73653a
am: 43d64bbee6

Change-Id: Ibe0ec3cee817eb1b15859286305b1481dd4a1dcd