[automerger skipped] Merge "Correct the cutout of external displays" into udc-d1-dev am: c4763ba12e am: 4a63cd7538 -s ours am: 79d20adf38 -s ours

am skip reason: Merged-In Ia01f8100ccff398194de9cc53a4edf31b7e74bf8 with SHA-1 2ce6052bf3 is already in history

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

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