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

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

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

Change-Id: I2510fa62b456e78042a78a3f46219185d6c73820