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

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

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