Merge "Separate trace of trampoline launch with different packages" into sc-dev am: 05e83c1c

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

Change-Id: I7cb223a7dd854f48b6a7156a017012489bbabb2a