Merge "Revert "Capture event log"" am: 2c86cec3 am: 856508fb am:...

Merge "Revert "Capture event log"" am: 2c86cec3 am: 856508fb am: f88ac925 am: e38645e2 am: fdebd879 am: 3baad9b4

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



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