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

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

Change-Id: I29f3b701c4cbfca33ffc4332c13981add6372f19