Revert "Fix deadlock caused by two-threaded property controls" am: d1076eb728 am: 5164539e78

Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/24028888

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