[automerge] Re-land "Move rounded corner to provider" 2p: 4301034952 2p: 88e14532f8

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

Bug: 218951516
Change-Id: I18435128ae1c9980c1c756353b68d169b130fc14