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: 961a9d78

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



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