Merge "Keystore VTS for module hash" into main am: 6f6d8d1736

Original change: https://android-review.googlesource.com/c/platform/system/security/+/3426555

Change-Id: I16b3a0bb45f7c4960fc12e051d7c3990be20ba52
Signed-off-by: Automerger Merge Worker <[email protected]>