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: I0dfe5047f40d1bf57b9f94e972a54c14da968b63