Merge "Dump shell side transition trace with bug reports" into udc-dev am: 6368343761 am: cc94631c9c

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

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