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

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



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