Merge "Add 'com.android.media' to apex_available of libhardware_headers" am: 3fe6921aff am: 26748f3084

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

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