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

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

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