Revert "Remove references to keymint1" am: 34536a3528

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4216c2b277ee0af4f5e044873be75388ab7917bc