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

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

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