Merge "Distinguish process-switch for launch trace" into tm-dev am: 8890d473 am: d8b5b700

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



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