[automerger skipped] Merge "AudioFlinger: Update Thread class includes" into udc-dev-plus-aosp am: 3de149ac5e am: d1f3174656 -s ours

am skip reason: Merged-In I4f3792a5a270c45e788ff4f98cc3e04ee434d075 with SHA-1 409572b3d5 is already in history

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

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