Move DSB and Notification services inside Status bar section to restore compatibility with themes

Change-Id: I9ff6803ade04269e2d7c249e03410001ea047ded

Conflicts:
	res/xml/settings_headers.xml
	res/xml/status_bar.xml