Add option to vibrate on notification expansion

Change-Id: Ib90d63912c3a81b0e1867893a1a0061e709883c1

Conflicts:

	core/java/android/provider/Settings.java