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: 21910b0f

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



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