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

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

Change-Id: Iaeb2c696d4412d89a09067286af2df4650c10a00