Merge "Merge "No need to include cutils/threads.h" into main am: aaddb6cb...

Merge "Merge "No need to include cutils/threads.h" into main am: aaddb6cb am: d2294c8c" into udc-dev-plus-aosp am: a5a00113 am: 95fc58bc

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2644815



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