Revert "Fix deadlock caused by two-threaded property controls" am: d1076eb728 am: af594059f4 am: 7e37dd36db am: 4d0ffbfec9

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

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