Merge "Add ability to trace shell transitions" into tm-qpr-dev am: 1abf4745

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



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