[automerger skipped] Guest mode UX flow updates to user settings am: a1fbad7d -s ours

am skip reason: Merged-In I54583f9021171ae523ff40d4f63835f1cb486e35 with SHA-1 fa49a4f1 is already in history

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



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