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: 67e6f527

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



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