Merge "Merge "New TraceUtilsTest" into udc-dev am: dfc9cf33 am: 3d05c9b7"...

Merge "Merge "New TraceUtilsTest" into udc-dev am: dfc9cf33 am: 3d05c9b7" into udc-d1-dev-plus-aosp am: 043f6365

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



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