[automerger skipped] Merge "[SettingsProvider] fix font size scale validator"...

[automerger skipped] Merge "[SettingsProvider] fix font size scale validator" into qt-dev am: 1a96cae4 -s ours am: e8630b7a -s ours am: 0d8b71b1 -s ours am: cb3efa67 -s ours

am skip reason: Change-Id I32f3b7ece78ec8cc97c52a0484151a6a777aa9da with SHA-1 edeb081a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03e3a616b87ed09e98c72782ea2b7a3fb9ee602d