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

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

Change-Id: I7a93ce3224ad1f4fc8dfd8a180dd3dec683fc936

libs/hwui/WebViewFunctorManager.cpp

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