Merge "Add media ownership for atneya" am: 39759741 am: d0673d20 am: 2b8d44a3 am: 33ebcdbe am: 0ee0b111

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



Change-Id: I1a96952fd23e902850b30510b574049122f14a59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>