Merge "Mark Media APEX as visible" am: b1dd3d1d3e am: f14fd4fafe

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

Change-Id: Iae5333a29aff116173e2a7140f8bc93e62b562cb