Merge "CachedSet::append: remove mHolePunchLayer" into sc-dev am: 160a952fc8 am: f40f4ce1f6

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

Change-Id: I0b11448a465264a04506a36840491cb12d8b5f6b