Merge "Fix display size calculations in large screen (2/3)" into tm-qpr-dev am: 13255a0a

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



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