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

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

Change-Id: I11e8ae4164589fcc75684191fed343649139d6e4