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

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

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