Merge "Clear binder identity before releasing wakelock" into sc-v2-dev am: addb12da35 am: 129e389bc7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16545944

Change-Id: I5db4b0efae8865af843cb2723834ec5077befc53

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