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

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



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