Merge "The Google specific bits should not in AOSP tests."

tests/uitests/src/com/android/settings/ui/HomepageDisplayTests.java

@@ -54,8 +54,7 @@ public class HomepageDisplayTests {
             "Security & location",
             "Accounts",
             "Accessibility",
-            "System",
+            "System"
-            "Support & tips"
     };
 
     private UiDevice mDevice;