Revert^2 "Remove references to keymint1" am: e39f876779

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1525186

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I32bf831d848d9c605df93630fad8381c05cb3515