Revert "Fix deadlock caused by two-threaded property controls" am: 3196be61fc am: 2d8c7d8096

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/24028968

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