Merge "Fix multi-display nav bar tests on large screen devices" into tm-qpr-dev am: cfaad7ffb3

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

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

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarController.java

@@ -302,10 +302,6 @@ public class NavigationBarController implements
      */
     @VisibleForTesting
     void createNavigationBar(Display display, Bundle savedState, RegisterStatusBarResult result) {
-        if (initializeTaskbarIfNecessary()) {
-            return;
-        }
-
         if (display == null) {
             return;
         }
@@ -315,7 +311,7 @@ public class NavigationBarController implements
 
         // We may show TaskBar on the default display for large screen device. Don't need to create
         // navigation bar for this case.
-        if (mIsTablet && isOnDefaultDisplay) {
+        if (isOnDefaultDisplay && initializeTaskbarIfNecessary()) {
             return;
         }