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

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



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