Merge "Change KeyMint KeyCharacteristics" am: 78ab7d6c06

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d4f689291ebc2b03cd57baa18f46fa7d483022d