[automerger skipped] Merge "Correct the cutout of external displays" into...

[automerger skipped] Merge "Correct the cutout of external displays" into udc-d1-dev am: c4763ba1 -s ours

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

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



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