Merge "Stop serving HIDL media.c2 software instance in 202404 devices" into main