[automerger skipped] Merge "AudioFlinger: Update Thread class includes" into udc-qpr-dev-plus-aosp am: 32f994e5c9 -s ours

am skip reason: Merged-In I4f3792a5a270c45e788ff4f98cc3e04ee434d075 with SHA-1 25a80ac751 is already in history

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

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