[automerger skipped] Merge "Trace events while not recording history." into...

[automerger skipped] Merge "Trace events while not recording history." into udc-dev am: 3a310dd2 am: 10a729d9 am: 1743700e -s ours am: 329775b6 -s ours

am skip reason: Merged-In I52fc02cd8336adcb6f12305c584206242c40f507 with SHA-1 165c521e is already in history

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



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