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

Merge "Revert "Add ability to trace shell transitions"" into tm-qpr-dev am: 180b7525 am: 2f68cafb

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



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