hybrid icon test 1
Merge branch 'bam6' of https://github.com/iGio90/android_packages_apps_Settings into bam6