Merge "Check Media c2 AIDL flag only for older devices" into main