[automerger skipped] Merge "Add missing ThreadDefs.h header" am: 2362edf7...

[automerger skipped] Merge "Add missing ThreadDefs.h header" am: 2362edf7 am: ddb3fb53 am: 1d962654 -s ours am: 6b894f67 -s ours

am skip reason: Merged-In If4c6494d1bf3a32516ada3670ee449e2a047c7ed with SHA-1 bb752684 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2017407

Change-Id: I29db6de38d4b505d0b90f7b54c4033d1ed898cde