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

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

Change-Id: Iade42bb132e5b77ed2a2acdec5c7afdedb1f5052