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

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



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