Merge "Merge "Allow separate top and bottom rounded.xml layouts" into rvc-d1-dev am: eab7e2a1 am: 46a2177c" into rvc-qpr-dev-plus-aosp am: cb18f7bd

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

Change-Id: Iad199ffc3da7b075fd9e8fe2c6b6cf6c743e2e7a