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

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



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