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

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



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