Merge "Fix Settings crash due to Allow guest to use phone with guest user"...

Merge "Fix Settings crash due to Allow guest to use phone with guest user" into udc-qpr-dev am: 22fa02c3

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



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