Revert "Remove references to keymint1" am: 34536a3528 am: e92381b4ec

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I62485608a5bb5b10769ec8e77f5d423a853234f5