Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev

src/com/android/settings/development/MockLocationAppPreferenceController.java

@@ -86,6 +86,12 @@ public class MockLocationAppPreferenceController extends DeveloperOptionsPrefere
         return true;
     }
 
+    @Override
+    public void onDeveloperOptionsDisabled() {
+        super.onDeveloperOptionsDisabled();
+        removeAllMockLocations();
+    }
+
     private void updateMockLocation() {
         final String mockLocationApp = getCurrentMockLocationApp();