[automerger skipped] Merge "AudioFlinger: Update Thread class includes" into...

[automerger skipped] Merge "AudioFlinger: Update Thread class includes" into udc-dev-plus-aosp am: 3de149ac am: d1f31746 -s ours am: 4d16dd4d -s ours

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

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



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