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

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

Change-Id: I0b76f3dfa992bd360b59418f721c26abd814193d