[automerger skipped] [DO NOT MERGE]Support rounded corner for multi-display devices am: 6603444a am: bae802cf -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iae817a4b8ac971ea23ab79311e861cfb8b431be0