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: b9a19a3a am: 56b3b5bb

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



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