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 am: bb87b47d

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



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