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

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

Change-Id: I6f667d1c10b476abd96a85971f421bad0e17e71d