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

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

Change-Id: Ic21c72c4405c1e775228c946967c1b015bbef731