Merge "Remove fatal assert from CachedSet::render" into sc-dev am: 3b71371d99 am: 08b5b274d7

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

Change-Id: I183f235f64e38208e1d754106f1b406f1ef13beb