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

Change-Id: I2acaae55114901c60a70536d836aff5fa32c9631