Merge "Do not create worker thread if threading isn't enabled" am: a4dae3c6...

Merge "Do not create worker thread if threading isn't enabled" am: a4dae3c6 am: 4ed3c3bf am: 89d56397

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2378128



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