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

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

Change-Id: I629a76e3b9badd76fa46ee921013da726fda7034