Merge "After deleting guest user, switch back to previous instead of user0."...

Merge "After deleting guest user, switch back to previous instead of user0." into udc-qpr-dev am: e42dcd73

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830766



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