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

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

Change-Id: I37419d3cf4b1ff2e4854a17b47664892cff1a185