Revert "Fix deadlock caused by two-threaded property controls" am: d1076eb728 am: af594059f4 am: 6a53c1a805 am: 052fa2130c

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

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