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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I880cfa41749263ca9076d198a8e8c3f73e9d1576