Merge "Fix for WebView not drawing in a layer" into rvc-dev am: 70a24c3253 am: b5753580ca am: c52eca8a1f

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

Change-Id: I3369f0a5309824035f5646f3d08bc8fd9b52f6bb