Merge "Don't re-render CachedSets" into sc-dev am: 0b0a068ae0 am: 21fdf1feaa am: d7ee030dc8

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

Change-Id: I6a9c19702f8c155a6667d2645f84ce04cb8b90b0