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

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



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