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

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

Change-Id: I595fe6c41cd4f1229818d30aa780cc328a97c265