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

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

Change-Id: Ic88ed4fb3ab336d332f37bd10be8294f66add4d0