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

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

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