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 am: 0d47b7f0 am: aadea827

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



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