Merge "Add logging for flaky tests"

services/core/java/com/android/server/biometrics/AuthSession.java

@@ -142,6 +142,7 @@ public final class AuthSession implements IBinder.DeathRecipient {
             @NonNull PromptInfo promptInfo,
             boolean debugEnabled,
             @NonNull List<FingerprintSensorPropertiesInternal> fingerprintSensorProperties) {
+        Slog.d(TAG, "Creating AuthSession with: " + preAuthInfo);
         mContext = context;
         mStatusBarService = statusBarService;
         mSysuiReceiver = sysuiReceiver;

services/core/java/com/android/server/biometrics/BiometricService.java

@@ -1047,7 +1047,7 @@ public class BiometricService extends SystemService {
                 final Pair<Integer, Integer> preAuthStatus = preAuthInfo.getPreAuthenticateStatus();
 
                 Slog.d(TAG, "handleAuthenticate: modality(" + preAuthStatus.first
-                        + "), status(" + preAuthStatus.second + ")");
+                        + "), status(" + preAuthStatus.second + "), preAuthInfo: " + preAuthInfo);
 
                 if (preAuthStatus.second == BiometricConstants.BIOMETRIC_SUCCESS) {
                     // If BIOMETRIC_WEAK or BIOMETRIC_STRONG are allowed, but not enrolled, but