Merge "SF: add a solid background when hole punching a cached set" into sc-dev am: 4d56aeed59 am: f284e584fd am: 56ca082910

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

Change-Id: I8028f35625eaec1fe8c5c9394b90be59c8c1c8aa