Merge "Trace events while not recording history." into udc-dev am: 3a310dd2...

Merge "Trace events while not recording history." into udc-dev am: 3a310dd2 am: 10a729d9 am: f25154f9

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



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