Merge "Fix display size calculations in large screen (2/3)" into tm-qpr-dev...

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

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



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