[automerger skipped] Merge "Set display size to all displays" into tm-qpr-dev...

[automerger skipped] Merge "Set display size to all displays" into tm-qpr-dev am: 0066afbe am: 059ddcbc -s ours

am skip reason: Merged-In I3d6858a9b20798c2ad3b12a66db3484491682691 with SHA-1 93ac8a9c is already in history

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



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