Merge "Mark Media APEX as visible" am: b1dd3d1d3e am: f14fd4fafe am: 4c9f66ba38 am: 8b71134468

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1422788

Change-Id: Ic7c61980ba9c550f96dfbed8f9633e69a1c9c7bc