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

[automerger skipped] Merge "[SettingsProvider] extend font size scale range" into rvc-qpr-dev am: 06c81b12 am: 1acb247f -s ours am: a1a18aa7 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic132b0ef0c29b78cb33a2b3cac8b24f6eb4b2647