Merge "Update OWNERS for OnReceiveContentListener and ContentInfo" am: 2990dccc16 am: 736e5ea3a5 am: 838aff1230

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

Change-Id: I23fa0b898d4298509a2d37c7edc6be7ab06e6dc3