[automerger skipped] Merge "TimeCheck: Track waiting through thread join in...

[automerger skipped] Merge "TimeCheck: Track waiting through thread join in AudioFlinger" into main am: bfbb157f am: 3909e434 -s ours

am skip reason: Merged-In Id633d1371c6aedd111a04510c49e95729a0c7790 with SHA-1 51e73d36 is already in history

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



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