Merge "vts: Correct the parameters on strongbox" am: 384c82dd14 am: 01409e422d am: 5dc2627249

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1693566

Change-Id: I76a34805c72e6e5c61ee3b96e853d5fa71624da3