Merge changes from topic "settings_presubmit_instr_test"

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

src/com/android/settings/notification/SoundSettings.java

@@ -71,7 +71,7 @@ public class SoundSettings extends DashboardFragment {
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_sound;
     }
 

src/com/android/settings/notification/ZenModeSettings.java

@@ -54,7 +54,7 @@ public class ZenModeSettings extends ZenModeSettingsBase {
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_uri_interruptions;
     }