Merge "[contentsuggestions] update owners file" into main am: c39a8f80 am:...

Merge "[contentsuggestions] update owners file" into main am: c39a8f80 am: aa9d9647 am: 28d1c27c

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



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