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

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

Change-Id: I9425afd8386133a14b816ed73b454d715d6030c6