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

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



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