[automerger skipped] Override layout in display cutout mode when needed am: 3cf0f1e2 -s ours

am skip reason: Merged-In I24e922d2200f0a3c362aeef36512c716590ce4d9 with SHA-1 88dba1b3 is already in history

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



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