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

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

Change-Id: I7b67922d60ab302af439551b9f589305ae9c0d13