Merge "Modify logic for showing the Unsupported Display Size dialog" into...

Merge "Modify logic for showing the Unsupported Display Size dialog" into aosp-main-future am: 9bd539ce

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



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