Merge "Distinguish process-switch for launch trace" into tm-dev am: 8890d47366 am: d8b5b70044 am: 151134e747 am: 53bc77acb1

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

Change-Id: I2666fe68d1689e6c2b9c9065987eee6bd0983fe6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

@@ -214,7 +214,8 @@ class ActivityMetricsLogger {
             if (mAssociatedTransitionInfo == null) {
                 launchResult = ":failed";
             } else {
-                launchResult = (abort ? ":canceled:" : ":completed:")
+                launchResult = (abort ? ":canceled:" : mAssociatedTransitionInfo.mProcessSwitch
+                        ? ":completed:" : ":completed-same-process:")
                         + mAssociatedTransitionInfo.mLastLaunchedActivity.packageName;
             }
             // Put a supplement trace as the description of the async trace with the same id.