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

Merge "Keystore: Added missing error codes" am: 15821b60 am: 3b674623 am: 060c58dd am: 113c14da am: ea1fe8ec am: 4aadb826

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



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