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

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



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