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: b1d3047c am: 5aa2662d am: 5a3ead4b

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



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