Merge "Don't create unexpected display cutout or rounded corners" into tm-dev...

Merge "Don't create unexpected display cutout or rounded corners" into tm-dev am: 17267e88 am: 3e124d04 am: b9cf479d am: 811991f4

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



Change-Id: I369fd08faa84045c275c674d598ec7d0f4924fdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>