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

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

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