Merge "Merge "New TraceUtilsTest" into udc-dev am: dfc9cf33 am: 4ec63bf4"...

Merge "Merge "New TraceUtilsTest" into udc-dev am: dfc9cf33 am: 4ec63bf4" into udc-d1-dev-plus-aosp am: 3547e4c5

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



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