Merge "Tag toString fields for easier bugreport parsing" into sc-dev am: 0813101890 am: fa23a322ea

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15144257

Change-Id: I979d2b3cdf29680703b9e0eddd1a0edec89ed339

services/core/java/com/android/server/biometrics/sensors/BaseClientMonitor.java

@@ -268,9 +268,9 @@ public abstract class BaseClientMonitor extends LoggableMonitor
     public String toString() {
         return "{[" + mSequentialId + "] "
                 + this.getClass().getSimpleName()
-                + ", " + getProtoEnum()
-                + ", " + getOwnerString()
-                + ", " + getCookie()
-                + ", " + getTargetUserId() + "}";
+                + ", proto=" + getProtoEnum()
+                + ", owner=" + getOwnerString()
+                + ", cookie=" + getCookie()
+                + ", userId=" + getTargetUserId() + "}";
     }
 }