Merge "Fix KM VTS tests for Strongbox implementations" am: d6b4242d52
am: 3f200e078e

Change-Id: I0d902c501906b285fdb9f07340e1c3ff346e7327