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: 146a2e1a am: 59a3a2e1

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



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