Merge "[User Switcher] dismiss dialog appropriately." into tm-qpr-dev am: d779fab0 am: 5f73ba8a

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



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