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

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

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