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

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

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