Merge "Keyguard for Auto should only show up in case of a user switcher screen. Else, its safe to dismiss it otherwise." into qt-dev
am: 2dc6bda365

Change-Id: I0400cf04ada8ed3145ad6b71f8b3cd0cb06c778a