Merge "AndroidKeyStore: return error code on error"