Revert "[Autofill Framework] Fix presentation event logging sequence."

This reverts commit b5aacc7d6a76fd21a74c769113c603941f1bda79.

Reason for revert: Temp revert to make the revert more cleanly on 06.17 build

Change-Id: Ic466957f391ac5ce24c25a409b2efd16c5f8ae95
diff --git a/services/autofill/java/com/android/server/autofill/PresentationStatsEventLogger.java b/services/autofill/java/com/android/server/autofill/PresentationStatsEventLogger.java
index 026c69c..d7da2f0 100644
--- a/services/autofill/java/com/android/server/autofill/PresentationStatsEventLogger.java
+++ b/services/autofill/java/com/android/server/autofill/PresentationStatsEventLogger.java
@@ -846,6 +846,7 @@
                 mCallingAppUid,
                 event.mIsCredentialRequest,
                 event.mWebviewRequestedCredential,
+                event.mFilteredFillabaleViewCount,
                 event.mViewFillableTotalCount,
                 event.mViewFillFailureCount,
                 event.mFocusedId,
@@ -858,8 +859,7 @@
                 event.mSuggestionPresentedLastTimestampMs,
                 event.mFocusedVirtualAutofillId,
                 event.mFieldFirstLength,
-                event.mFieldLastLength,
-                event.mFilteredFillabaleViewCount);
+                event.mFieldLastLength);
         mEventInternal = Optional.empty();
     }