Merge changes from topic "update-transition-trace-dumping-structure" into...

Merge changes from topic "update-transition-trace-dumping-structure" into udc-dev am: b26be926 am: d7e89754

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



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