Merge "keystore_backend_binder: fix misinterpretation of getKeyCharacteristics return value." am: 2cd64544e0
am: fcd8b15f20

Change-Id: I9eb61644485a7cc66407d4f2faf405e01b309511