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

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



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