Revert "Fix deadlock caused by two-threaded property controls" am: 3196be61fc am: abc6e1240d am: 6d5e9dfda4

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

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