[automerger skipped] Merge "Guest mode UX flow updates to user settings" into...

[automerger skipped] Merge "Guest mode UX flow updates to user settings" into tm-qpr-dev am: ba155801 -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: Iea0a62b5aa0b2fb646ce1deb7a1f29546f68d1be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>