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: 51c3c39b

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

Change-Id: I0cc838e7c380c2ba8952491967137568f9259885