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

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

Change-Id: Ie2c616971e417b83753928d387c3405e82ec4213