Merge "Use semaphore instead of condition variable" into tm-dev am: 38332d52 am: 40da43d3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18291016



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