Merge "Change trace tag." into udc-dev am: b0bf15f9 am: 28cd7d99

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



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