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

Change-Id: I1aed33f922ec5e65ac085231cca9b37538d02942