Merge "Correct the description for getKeyCharacteristics" am: e8d43f7e59 am: bb1b56ab1f am: bf3990ca24 am: fe7eac4e06

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

Change-Id: I7efe5822e1409070e2e6acaa0ab7396154586615