Merge "Correct the cutout of external displays" into udc-qpr-dev am: 30d75658 am: 01c1d5cb

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



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