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: If1df5dbbf1a469f939f678714c57db6766ee692c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>