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: 7503659b am: 0fdde491

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



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