Merge "Secretkeeper: improve VTS tests" into main am: 6ba95073eb am: 0b17ba3091 am: 7b0f8e96b3

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

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