Merge "media.c2 aidl: apply IConfigrable interface change" into main