Merge "Fix that when I go to display size in the settings, the largest size...

Merge "Fix that when I go to display size in the settings, the largest size shows the smallest icons." into tm-qpr-dev am: 937821f3

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



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