Merge "Secretkeeper: improve VTS tests" into main am: 6ba95073eb

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

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