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 am: a3e3790a

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



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