Framework: safe headset volume option (1 of 2)

thanks DvTonder

Change-Id: I5355820a24d48c1d8f54ea17a7022d891ad07857

Conflicts:
	media/java/android/media/AudioService.java

Conflicts:
	core/java/android/provider/Settings.java
Bring back Vanir membar test

Change-Id: I8c0ba83a8fb2fe5c6d4e87e068a9a9b0cb209b6f

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/res/layout-land/status_bar_recent_panel.xml
	packages/SystemUI/res/layout/status_bar_recent_panel.xml