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

[automerger skipped] Merge "[SettingsProvider] fix font size scale validator" into qt-qpr1-dev am: fd6e352d -s ours am: f03c563e -s ours am: 934cf9fc -s ours am: cad5f649 -s ours am: 71726e36 -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/+/13178485

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a1f33694f25095b6db329641aea9b9baf2b38c8