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

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

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