Merge "Fix incorrect SID matching for bio prompts" into sc-v2-dev

keystore/java/android/security/keystore2/KeyStoreCryptoOperationUtils.java

@@ -89,7 +89,7 @@ abstract class KeyStoreCryptoOperationUtils {
         // specific sensor (the one that hasn't changed), and 2) currently the only
         // signal to developers is the UserNotAuthenticatedException, which doesn't
         // indicate a specific sensor.
-        boolean canUnlockViaBiometrics = true;
+        boolean canUnlockViaBiometrics = biometricSids.length > 0;
         for (long sid : biometricSids) {
             if (!keySids.contains(sid)) {
                 canUnlockViaBiometrics = false;