[automerger skipped] [content-capture] owners files updates am: 0314abcc -s ours am: ea7e3247 -s ours

am skip reason: Merged-In I6cc6ed844ee2e5617f0c944ff761a99de0363995 with SHA-1 447513d0 is already in history

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



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