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

Merge "Stop serving HIDL media.c2 software instance in 202404 devices" into main am: 4c6e3301 am: bae4459f

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2953821



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