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

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

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2801053



Change-Id: Id91e4b9088cd0b391bc21ec65d6f39dd56467c97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>