Merge "Keystore: Fix Device ID attestation test."

keystore/java/android/security/keystore/AttestationUtils.java

@@ -287,6 +287,8 @@ public abstract class AttestationUtils {
             keyStore.deleteEntry(keystoreAlias);
 
             return certificateChain;
+        } catch (SecurityException e) {
+            throw e;
         } catch (Exception e) {
             throw new DeviceIdAttestationException("Unable to perform attestation", e);
         }