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: e12472bd

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



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