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

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

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