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