Merge "Revert "Add event log for content capture"" into tm-qpr-dev am: a8865466 am: 98b1302c

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



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