Merge "media.c2 aidl: fix timeout calculation of pipe based C2Fence" into main