[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 skip reason: Change-Id I32f3b7ece78ec8cc97c52a0484151a6a777aa9da with SHA-1 3d79b643 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d340769858387cafb4fc810f80adb2178622940