[automerger skipped] Merge "[DO NOT MERGE]Support rounded corner for...

[automerger skipped] Merge "[DO NOT MERGE]Support rounded corner for multi-display devices" into sc-v2-dev am: 97b0de73 am: e8522e21 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I969820918ddd132d5b53c8118ce947bf51526b66