hide advanced_settings if not available
Merge branch 'jellybean' of https://github.com/cj360/android_packages_apps_Settings into jellybean
add missing code to hide advanced options if unavailable
Merge branch 'jellybean' of https://github.com/ParanoidAndroid/android_packages_apps_Settings into jellybean-legacy
fix conflicts & merge in jellybean branch of pa

Change-Id: I481d1863c5a7ad75738fcfd9a39b3fe53ed8e0dd
remove un-needed code from merge

Change-Id: I109add298f75babc7e0c05e89566182e3f680fbb
fix crashing advance tab

Change-Id: Id1950a0875a51e0a79b6216ff896109bde22c973
merge conflicts

Change-Id: I44492f535df48efb29dcdb448cda0a4ae9ef45a0