Merge "Merge "[content-capture] owners files updates" am: 7e5966f01e am: 197fe45fce am: ff75c56051" into udc-dev-plus-aosp am: 9307d8d3a9 am: cf5c2e67d3

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

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