[automerger skipped] Merge "[SettingsProvider] extend font size scale range"...

[automerger skipped] Merge "[SettingsProvider] extend font size scale range" into qt-dev am: a9638beb -s ours am: 146953df -s ours am: 0debf904 -s ours am: 8af18c07 -s ours

am skip reason: Change-Id Icff82d727d63da4353342b0f9a5ca3c2ae1671c1 with SHA-1 9b6c0fac is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13370383

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icba32e999007f78845edae752edf63347a05e5af