Merge "Update media owners" am: 00990aab81

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

Change-Id: Ic8f21c00414c3248eb5ec2ad3acec9572922514b