Merge "Revert "Revert "Add ability to trace shell transitions""" into...

Merge "Revert "Revert "Add ability to trace shell transitions""" into tm-qpr-dev am: 9fd0212e am: ddffd55d

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



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