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

Change-Id: Ibbc9a21a724fd3576aeae898761b4cd07b2a5128