Merge "When in guest mode, see "Exit guest" in user switcher" into tm-qpr-dev...

Merge "When in guest mode, see "Exit guest" in user switcher" into tm-qpr-dev am: 1a38ab1c am: a222a595

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20590287



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