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

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

Change-Id: I8a8f621506202c9a1b56d3089fda99718f51741f