Merge "Update OWNERS for the content and sync subsystem" am: f3265025d8

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

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