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

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



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