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

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



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