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

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



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