Merge "Separate trace of trampoline launch with different packages" into...

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

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

Change-Id: I30009bf78d601863bf87863a9464c1d0a11c7c43