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

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



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