Snap for 6341266 from 0b76ef19b5 to qt-qpr3-release

Change-Id: Ia441843ea6baf662430be40e7f2cf205dc87242f

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();