Merge "Update media owners" am: 00990aab81 am: 3a6cbce5d4 am: f79c3f88aa

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

Change-Id: If01ea358884055eaba43191633f2aaf01e90fc1c