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

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

Change-Id: I802b3cfea52ac9d09e5fc1b1b3a1e556346ed222