[automerger skipped] Merge "Add 'com.android.media' to apex_available of libhardware_headers" am: 3fe6921aff am: 26748f3084 am: f1325fc01b -s ours am: 30a754457e -s ours am: bf5a3d5f68 -s ours am: b026b2a875 -s ours

am skip reason: Merged-In I97df31b209630dc7fb6b46a0b0221c0d496e6375 with SHA-1 c8fbb82f08 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2585125

Change-Id: Idb3923def053b5476cc1f0701cf2cf364080b0a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>