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: 577d3c03

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



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