Merge "Prevent UserSwitchingDialog flashing when setup wizard is shown." into udc-dev am: d18c2e5b am: 25c25bfc am: 225033dd

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



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