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

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

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