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

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

Change-Id: Ic81b3e5f06ca59884bcaba9328895eb3e8da02f6