Merge "Re-land "Move rounded corner to provider"" into tm-dev am: cee24a3d...

Merge "Re-land "Move rounded corner to provider"" into tm-dev am: cee24a3d am: 14c01427 am: 48600d2f

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



Change-Id: I5b44ac8c32f8c000a91421f55676b1f022ddde22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>