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

Merge "media.c2 : Change waitable object to be based on single fd" into main am: c43c449c am: 90e403f2 am: 5eaab1d0 am: 8addf6a2

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



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