Revert "Fix deadlock caused by two-threaded property controls"

This reverts commit 606afc7b.

These fixes for b/262208935 introduced a race condition. We believe the
race is fixed by ag/23879563, but at this point in the release feel that
reverting the fixes and refixing in main is the better solution

Test: Builds, boots
Bug: 283202477
Bug: 288991737
Ignore-AOSP-First: Reverting CL only in internal
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3196be61fcf0e0303cf819630876b9c812b9474e)
Merged-In: I9ae6863b0ea5e064c59d9d34c03d33fa1da12fdc
Change-Id: I9ae6863b0ea5e064c59d9d34c03d33fa1da12fdc