Merge "Use small corner radius for roundness updates from shelf" into sc-dev...

Merge "Use small corner radius for roundness updates from shelf" into sc-dev am: 4d351c50 am: 45128206

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

Change-Id: I7778f92a8f4e44e697f4de1454349d178371b2d5