Merge "Tune display options for non-default display sizes" into tm-qpr-dev am:...

Merge "Tune display options for non-default display sizes" into tm-qpr-dev am: f1b88dcb am: da164682

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



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