Merge "Renamed thread_enabled flag to thread_enabled_platform" into main am: 771e5d9139 am: da16e05030

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

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