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

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

Change-Id: Id550d30f92c5249428cfb7d380047dba0d90e045