Merge "Split ring and notification vibration settings"

tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java

@@ -160,6 +160,11 @@ public class VibrationPreferenceFragmentTest {
             return Settings.System.HAPTIC_FEEDBACK_INTENSITY;
         }
 
+        @Override
+        protected String getVibrationEnabledSetting() {
+            return "";
+        }
+
         @Override
         protected int getDefaultVibrationIntensity() {
             return Vibrator.VIBRATION_INTENSITY_MEDIUM;