[automerger skipped] Fix display size calculations in large screen (2/3) am: 6183509d -s ours

am skip reason: Merged-In I9223ef5552ddb081e75de1242670862f2813e56d with SHA-1 d1e350c7 is already in history

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



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