Change KeyCharacteristics am: 7f42437ebb am: e456cabea9 am: ff4f3bd788

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1544908

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia855c96660ec3bf31777397c4e2880e199bb4977