Merge "Fix for WebView not drawing in a layer" into rvc-dev am: 70a24c3253 am: 22647c3f3d am: f1669896d1

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

Change-Id: I06bea09582922afb1db0607de223614f7d08dd87