Merge "media.c2 : Change waitable object to be based on single fd" into main am: c43c449c79 am: 90e403f2f6

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2753410

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