Revert "Guest mode UX flow updates to user settings"

Revert submission 16545010-kedarc-ephemeral-guest

Reason for revert: A conflicting CL got merged after presubmits were triggerred, will rebase and push again
Reverted Changes:
I86a5a1571:Guest mode updates to resolve privacy concerns in ...
I7cf205883:Guest mode UX flow updates to user settings

Change-Id: Ia09ab082bb7088831d81e10fd555cecfc8b239f3