Merge "Change KeyMint KeyCharacteristics" am: 78ab7d6c06 am: c80c9fc428

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3ab3d9a0e90fe15d591b420390b67fd641e4709