Merge "Don't allow users to be switched on keyguard when multiple users is...

Merge "Don't allow users to be switched on keyguard when multiple users is disabled" into udc-dev am: aa792b8d am: decd480f

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



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