Merge "MediaMetrics: Fix wait_until(max) for condition_variable" into main am:...

Merge "MediaMetrics: Fix wait_until(max) for condition_variable" into main am: cdc13855 am: 44f156ab

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



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