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

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



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