Merge "SF: add a solid background when hole punching a cached set" into sc-dev am: 4d56aeed am: 1ad96aab

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

Change-Id: I4c7229ded40f26a26fefba391a42baf1654a2592