Merge "Add media team members to OWNERS" am: 6300a62dbb am: 1c2d6c8fd5 am: f893c9711e am: 69042dbd16

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

Change-Id: Ib33ff071e89ba62960d1389014ee784a5be0fd35