Merge "Fix deadlock by not acquiring lock when reporting proximity" into tm-qpr-dev

services/core/java/com/android/server/attention/AttentionManagerService.java

@@ -668,8 +668,8 @@ public class AttentionManagerService extends SystemService {
             mIProximityUpdateCallback = new IProximityUpdateCallback.Stub() {
                 @Override
                 public void onProximityUpdate(double distance) {
-                    synchronized (mLock) {
                     mCallbackInternal.onProximityUpdate(distance);
+                    synchronized (mLock) {
                         freeIfInactiveLocked();
                     }
                 }