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: 87d2fd71 am: 61d57853 am: 64baddf5

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



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