Merge "media.c2 aidl: change minSdk to 30" into main