Merge "KeyMint 1 system side coding." am: 2ef464e90c am: 57f75667c8

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

Change-Id: I7ea1997a238cf4555e134ff617b357d0ea96c3cc