Settings icon v2
Merge branch 'bam6' of https://github.com/iGio90/android_packages_apps_Settings into bam6

Conflicts:
	res/mipmap-hdpi/Thumbs.db
	res/mipmap-xhdpi/Thumbs.db