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

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



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