Merge "rkp: add keymint v1 hash into rkp v1" am: 6410234d7c am: e2cc950790

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

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