Merge "Fix no guest visible while on multi user switcher" into tm-qpr-dev am:...

Merge "Fix no guest visible while on multi user switcher" into tm-qpr-dev am: 95799ff2 am: 95b8f5b7

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



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