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

[automerger skipped] Merge "[SettingsProvider] extend font size scale range" into rvc-dev am: e42ea74f -s ours am: 09376f38 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f2cf522eaf85a7665d0eef2829b9068238baaa3