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

Merge "Merge "Don't allow users to be switched on keyguard when multiple users is disabled" into udc-dev am: aa792b8d am: decd480f am: 7062a366" into udc-qpr-dev-plus-aosp am: 76b4ecf7

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



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