Merge "Fix for WebView not drawing in a layer" into rvc-dev am: 70a24c32 am: b5753580

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

Change-Id: I8a4704147d33c95a3ea5799f98293871e48902eb