Merge "Add media to hwasan-postsubmit" am: 5b543e8642 am: fb194c95b8 am: b03dd46117

Original change: https://android-review.googlesource.com/c/platform/system/media/+/2032367

Change-Id: I3e24d420f39c9aa800fc9b7dab2100fd0f0dd410