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

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

Change-Id: Ia73bfbe21624df14cb2e1fed67a5be082812d90d