Merge "Add Android Media TV members as owners of the framework/base/media component" am: ce164c0551 am: ef25912ec2

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

Change-Id: Ifb2b4900af84c69191a5ee05b77e5b1bdd23d472