Merge "Add event log for content capture" into tm-qpr-dev am: 0b0822b3

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



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