Revert "Merge branch 'master' of https://android.googlesource.com/platform/packages/apps/Settings into jb-ras-mr2.0"

This reverts commit c63ea75cad871696398279e6ff31fc0b6938464d, reversing
changes made to efa9bf2c998c8be2c26c148978caaee81575edbb.