Merge changes from topic "settings_presubmit_instr_test"

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

src/com/android/settings/bluetooth/BluetoothPairingDetail.java

@@ -169,7 +169,7 @@ public class BluetoothPairingDetail extends DeviceListPreferenceFragment impleme
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_bluetooth;
     }
 

src/com/android/settings/bluetooth/BluetoothSettings.java

@@ -345,7 +345,7 @@ public class BluetoothSettings extends DeviceListPreferenceFragment implements I
     }
 
     @Override
-    protected int getHelpResource() {
+    public int getHelpResource() {
         return R.string.help_url_bluetooth;
     }