Merge "Correct display dimensions considered." into udc-dev am: c583707c

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



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