Merge "Allow separate top and bottom rounded.xml layouts" into rvc-d1-dev am:...

Merge "Allow separate top and bottom rounded.xml layouts" into rvc-d1-dev am: eab7e2a1 am: 74edb0cc am: 9f05c6c5

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

Change-Id: If64a91ce0e52a696f783abe5f897738ec10f0f2e