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

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

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