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

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



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