[automerger skipped] Merge "[contentsuggestions] update owners file" into main am: c39a8f8012 am: 6f6717161c -s ours

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

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

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