Merge "Log UI events to traces" am: a9666fccb9 am: 6e713ddc1e am: 8b81ff8dbc am: 891c20d026

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

Change-Id: I5ed8fc8d20463550a043443b2e03e73b3d103a52