Merge "Set display size to all displays" into tm-qpr-dev am: 0066afbe

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20664686



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