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

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



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