Merge "Add media ownership for atneya" am: 39759741 am: d0673d20 am: 2b8d44a3

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



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