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

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

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