Merge "Make sure instance launch trace for an id only appears once" into...

Merge "Make sure instance launch trace for an id only appears once" into tm-dev am: 4e42dc05 am: 296a0a4f

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



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