Merge "Fix back arrow in wifi settings "connect to this network connection qr code" does not work" into qt-dev

src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java

@@ -323,15 +323,10 @@ public class WifiDppConfiguratorActivity extends InstrumentedActivity implements
 
     @Override
     public boolean onNavigateUp() {
-        Fragment fragment = mFragmentManager.findFragmentById(R.id.fragment_container);
-        if (fragment instanceof WifiDppQrCodeGeneratorFragment) {
+        if (!mFragmentManager.popBackStackImmediate()) {
             finish();
-            return true;
-        } else if (fragment instanceof WifiDppQrCodeScannerFragment) {
-            mFragmentManager.popBackStackImmediate();
         }
-
-        return false;
+        return true;
     }
 
     @Override