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: 3026c72f am: 338957f8 am: 3095bebb

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



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