Merge changes from topic "settings_presubmit_instr_test"

* changes:
  Refactor help menu stuff into a controller
  Fix UniquePreferenceTest

src/com/android/settings/wfd/WifiDisplaySettings.java

@@ -141,7 +141,7 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment implem
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_remote_display;
     }