[automerger skipped] Merge "[contentsuggestions] update owners file" into main...

[automerger skipped] Merge "[contentsuggestions] update owners file" into main am: c39a8f80 am: 6f671716 -s ours am: 43a6ab5b -s ours

am skip reason: Merged-In Ic0ffab3d0e673a65da0963b3726ea9e960c36da8 with SHA-1 cb6edb60 is already in history

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



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