Merge "Fix settings crash by removing potential deadlock in...

Merge "Fix settings crash by removing potential deadlock in setDefaultGuestRestrictions" into udc-qpr-dev am: 36680dc6 am: 38f25943

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



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