[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: 6fb2cb5d -s ours am: cc57c0f2 -s ours am: dc0d6f94 -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: I72ee8c043a562c843ece285e7738fbcac132cb73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>