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: 00404db7 am: d102016c

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



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