Merge "Support Vibrate for calls in Settings Slices" into pi-dev

diff --cc res/xml/sound_settings.xml
index 5bee7b0,176af5a..a70c85d
--- 1/res/xml/sound_settings.xml
--- 2/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@@ -60,14 -61,9 +60,8 @@@
          android:icon="@*android:drawable/ic_audio_ring_notif"
          android:title="@string/ring_volume_option_title"
          android:order="-160"
 -        settings:controller="com.android.settings.notification.RingVolumePreferenceController"
 -        settings:allowDividerAbove="true"/>
 +        settings:controller="com.android.settings.notification.RingVolumePreferenceController"/>
  
-     <!-- Also vibrate for calls -->
-     <SwitchPreference
-         android:key="vibrate_when_ringing"
-         android:title="@string/vibrate_when_ringing_title"
-         android:order="-155"/>
- 
      <!-- Alarm volume -->
      <com.android.settings.notification.VolumeSeekBarPreference
          android:key="alarm_volume"