Merge "Remove fatal assert from CachedSet::render" into sc-dev am: 3b71371d99 am: 7ea8748949 am: d08a17375f

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

Change-Id: I7702bdd5871fe927788bbc83ee27e7388f1232fa