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: I82c439c8bb5cfb7affcae7a2bdc5f3f66f394da0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>