Merge "[content-capture] owners files updates" am: 7e5966f0

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



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