Merge "Wait for keyguard to be shown before completing the user switch." into...

Merge "Wait for keyguard to be shown before completing the user switch." into udc-dev am: df14a8f7 am: 227764bb am: cc3c0c3d am: 973ecbbe

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



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