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

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



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