Merge "Keystore: Added missing error codes" am: 15821b60 am: 3b674623 am: 060c58dd

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2534342



Change-Id: Idf72f2a3443957ed754cc906f231daefe77e1700
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>