Improved some WM / AM logs

Test: atest --user-type secondary_user ActivityManagerTest#testGetRecentTasks
Bug: 270604218

Change-Id: Ieb5a8844bc309dfe61bc92b367fbf0b73ded7489

core/java/android/app/ActivityOptions.java

@@ -2539,7 +2539,8 @@ public class ActivityOptions extends ComponentOptions {
     public String toString() {
         return "ActivityOptions(" + hashCode() + "), mPackageName=" + mPackageName
                 + ", mAnimationType=" + mAnimationType + ", mStartX=" + mStartX + ", mStartY="
-                + mStartY + ", mWidth=" + mWidth + ", mHeight=" + mHeight;
+                + mStartY + ", mWidth=" + mWidth + ", mHeight=" + mHeight + ", mLaunchDisplayId="
+                + mLaunchDisplayId;
     }
 
     /**

services/core/java/com/android/server/wm/ActivityMetricsLogger.java

@@ -1154,6 +1154,8 @@ class ActivityMetricsLogger {
         sb.setLength(0);
         sb.append("Displayed ");
         sb.append(info.launchedActivityShortComponentName);
+        sb.append(" for user ");
+        sb.append(info.userId);
         sb.append(": ");
         TimeUtils.formatDuration(info.windowsDrawnDelayMs, sb);
         Log.i(TAG, sb.toString());

services/core/java/com/android/server/wm/RecentTasks.java

@@ -978,9 +978,10 @@ class RecentTasks {
 
             if (!task.mUserSetupComplete) {
                 // Don't include task launched while user is not done setting-up.
-                if (DEBUG_RECENTS) {
-                    Slog.d(TAG_RECENTS, "Skipping, user setup not complete: " + task);
-                }
+
+                // NOTE: not guarding with DEBUG_RECENTS as it's not frequent enough to spam logcat,
+                // but is useful when running CTS.
+                Slog.d(TAG_RECENTS, "Skipping, user setup not complete: " + task);
                 continue;
             }