Rearrange vibration settings under sound

Change-Id: Idd3a1f801e92a18fa28bd8dd93ed69f223592949
Merge "Rearrange vibration settings under sound" into du44
Merge remote-tracking branch 'upstream/du44' into du44