[automerger skipped] Correct display dimensions considered. am: 3d8957b1 am:...

[automerger skipped] Correct display dimensions considered. am: 3d8957b1 am: 728d1427 -s ours am: c3ac21e4 -s ours am: 07181d26 -s ours

am skip reason: Merged-In I48c072491efc62c49385ae5f4684d99585a05895 with SHA-1 52329d28 is already in history

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



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