[automerger skipped] Merge "Fix display size calculations in large screen...

[automerger skipped] Merge "Fix display size calculations in large screen (2/3)" am: 3b60cd3b -s ours am: 90b47358 -s ours am: e6716cc4 -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: I2c03f27b99faf2517bd4822cd23258a2273fef50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>