Merge "Remove HIDL media C2 from 202404 compatibility matrix" into main