Merge "Merge "Reparent surface control for Webview overlay" into sc-dev am: 4d7a36be am: 06f4d0f3" into sc-v2-dev-plus-aosp am: c02ed5be

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

Change-Id: I9b2901057441d50622fbcbd92d5a4165ea4a1583