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

Change-Id: I0c214e412d2fe1c3eb0f843face90a6ccbf3b031