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: I9f4e5c1ea0b3de0b4cd03f9aac691715502bca7b

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java

@@ -314,6 +314,7 @@ public class CarStatusBar extends StatusBar implements
     public void showKeyguard() {
         super.showKeyguard();
         updateNavBarForKeyguardContent();
+        dismissKeyguardWhenUserSwitcherNotDisplayed();
     }
 
     /**