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