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

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



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