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: I6957476a78b78e6306cd87e7ed6250d2bde72330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>