Merge "Fix display cutout vertical centering bug" into tm-qpr-dev am: 6d0518e9 am: b49d0331

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



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