New settings icon

xhdpi hdpi
Merge branch 'bam6' of https://github.com/iGio90/android_packages_apps_Settings into bam6

Conflicts:
	res/mipmap-hdpi/ic_launcher_settings.png