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

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

Change-Id: I543d67c61676c46572d550c22eab52241a8fa365