Merge "Clear binder identity before releasing wakelock" into sc-v2-dev

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

@@ -2846,10 +2846,13 @@ public class LocationProviderManager extends
 
         @Override
         public void sendResult(Bundle data) {
+            final long identity = Binder.clearCallingIdentity();
             try {
                 mWakeLock.release();
             } catch (RuntimeException e) {
                 Log.e(TAG, "wakelock over-released by " + mIdentity, e);
+            } finally {
+                Binder.restoreCallingIdentity(identity);
             }
         }
     }