Merge "Use VSR to tell libhwtrust_cxx how to validate" am: c71a8d0ef1 am: 4110edd04f

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

Change-Id: I5f91785a31789ba87457089debb30e6dfd353223
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>