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

Change-Id: I871c267b9aab81bc94f5d587e991fc896e2b8268