[automerger skipped] Correct the cutout of external displays am: 2ce6052b -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: I2d3c7c7d88e618001ae0ade9b03750a3c257f1b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>