Merge "Establish permanently unavailable settings"

src/com/android/settings/location/LocationScanningPreferenceController.java

@@ -36,6 +36,6 @@ public class LocationScanningPreferenceController extends BasePreferenceControll
     public int getAvailabilityStatus() {
         return mContext.getResources().getBoolean(R.bool.config_show_location_scanning)
                 ? AVAILABLE
-                : DISABLED_UNSUPPORTED;
+                : UNSUPPORTED_ON_DEVICE;
     }
 }