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

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

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