Merge "Fix potential deadlock in applyUserRestrictions methods." into udc-dev am: 644791aa

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22459423



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