Merge "Remove Webview Overlays on destroy" into sc-dev am: e44bc77bc3 am: dc7594b513

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

Change-Id: I7538b9f56f6f8e759b4894f62eca0f4c7e9ba4b1

libs/hwui/WebViewFunctorManager.cpp

@@ -100,6 +100,9 @@ WebViewFunctor::~WebViewFunctor() {
     destroyContext();
 
     ATRACE_NAME("WebViewFunctor::onDestroy");
+    if (mSurfaceControl) {
+        removeOverlays();
+    }
     mCallbacks.onDestroyed(mFunctor, mData);
 }