Merge "Keystore 2.0: Fix getKey returns null on key not found."

        try {

            response = keyStore.getKeyEntry(descriptor);

        } catch (android.security.KeyStoreException e) {

            if (e.getErrorCode() == ResponseCode.KEY_PERMANENTLY_INVALIDATED) {

            switch (e.getErrorCode()) {

                case ResponseCode.KEY_NOT_FOUND:

                    return null;

                case ResponseCode.KEY_PERMANENTLY_INVALIDATED:

                    throw new KeyPermanentlyInvalidatedException(

                            "User changed or deleted their auth credentials",

                            e);

            } else {

                default:

                    throw (UnrecoverableKeyException)

                            new UnrecoverableKeyException("Failed to obtain information about key")

                                    .initCause(e);