Merge "Fix crash due to race on close()" into tm-qpr-dev am: faf0b610d3 am: 1c479ea1eb

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

Change-Id: Iec43ea91eca94552fb9a1a9da1b8ab8d19e819b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/java/android/view/ScrollCaptureConnection.java

@@ -214,7 +214,7 @@ public class ScrollCaptureConnection extends IScrollCaptureConnection.Stub imple
 
     @BinderThread
     @Override
-    public void close() {
+    public synchronized void close() {
         Trace.instantForTrack(TRACE_TAG_GRAPHICS, TRACE_TRACK, "close");
         if (mActive) {
             Log.w(TAG, "close(): capture session still active! Ending now.");