Merge "Remove circular dependency between datatypes and traces package" into...

Merge "Remove circular dependency between datatypes and traces package" into udc-dev am: 4dd6a965 am: 13b6f856 am: 3441c5ef

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



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