Merge "rkp: add keymint v1 hash into rkp v1" am: 6410234d am: e2cc9507 am: feb5f137

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



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