Backed out changeset 66cc38d90f25 (bug 1112397) for making testSettingsMenuItems permafail on Android 4.0.

mobile/android/base/tests/testSettingsMenuItems.java

@@ -258,9 +258,8 @@ public class testSettingsMenuItems extends PixelTest {
                 }
             }
 
-            // Navigate back if on a phone or small tablets. Large tablets
-            // shouldn't do this because they use headers and fragments.
-            if (mDevice.type.equals("phone") || HardwareUtils.isSmallTablet()) {
+            // Navigate back if on a phone. Tablets shouldn't do this because they use headers and fragments.
+            if (mDevice.type.equals("phone")) {
                 int menuDepth = menuPath.length;
                 while (menuDepth > 0) {
                     mActions.sendSpecialKey(Actions.SpecialKey.BACK);