[automerger skipped] Merge "Override layout in display cutout mode when...

[automerger skipped] Merge "Override layout in display cutout mode when needed" into 24D1-dev am: 8bd6d5d6 -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: Ibe68130ef1ffde98bdf6f4e770c6a53fde71a2bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>