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

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



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