Merge "Ensure proper lock is held for all removal ops"

services/core/java/com/android/server/location/LocationProviderManager.java

@@ -313,6 +313,14 @@ class LocationProviderManager extends
             }
         }
 
+        @Override
+        public final <Listener> void onOperationFailure(ListenerOperation<Listener> operation,
+                Exception e) {
+            synchronized (mLock) {
+                super.onOperationFailure(operation, e);
+            }
+        }
+
         @Override
         public final LocationRequest getRequest() {
             return mProviderLocationRequest;