Merge "Unbind from dream overlay in onUnbind." into tm-dev am: 493062c55e

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

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

core/java/android/service/dreams/DreamService.java

@@ -999,6 +999,14 @@ public class DreamService extends Service implements Window.Callback {
         return mDreamServiceWrapper;
     }
 
+    @Override
+    public boolean onUnbind(Intent intent) {
+        // We must unbind from any overlay connection if we are unbound before finishing.
+        mOverlayConnection.unbind(this);
+
+        return super.onUnbind(intent);
+    }
+
     /**
      * Stops the dream and detaches from the window.
      * <p>