Merge "Cache a larger variety of clipped rounded rects" into sc-dev am: f180496878

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

Change-Id: I02c60331c580ebeca3a49c5ef6c0fe4489605f1b