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

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

Change-Id: I5f41b3a4c5521ef1965a85971612dd6008e87da6