Merge "Fix deadlock caused by two-threaded property controls" into udc-dev am:...

Merge "Fix deadlock caused by two-threaded property controls" into udc-dev am: 82db8b9c am: 94d99a2b

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



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