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

[automerger skipped] Merge "[SettingsProvider] extend font size scale range" into qt-qpr1-dev am: 4097309f -s ours am: 45faf04f -s ours am: 21aa3adb -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/+/13370393

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic74ed9407d05aa6e8a6b3d4d1c888d99ac6481d4