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

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

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