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

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



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