Revert "Merge branch 'cm-11.0' of https://github.com/CM-i9300-builds/android_packages_apps_Settings into cm-11.0"

This reverts commit a2496eb3a2ef5076af5e179b36b988deb0f46830, reversing
changes made to bd65d1fb0dccaf8393d932638d44dd37ea970a71.