[automerge] Update media owners 2p: 6d1dbc7bf1

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


Change-Id: I423608981dd18d23d88e4f0be71d2d3d76de109d
Merged-In: I1afc15bbc0e897775e2eb477b71be6567e411f09