Merge "Log UI events to traces" am: a9666fccb9 am: 6e713ddc1e

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

Change-Id: Ica852f77a0771b6a44bbaffbe019a634f0dc4622