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

[automerger skipped] Merge "[SettingsProvider] fix font size scale validator" into rvc-dev am: 9431e056 am: 61c6fa39 -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/+/13178963

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b82a24c4ff4bb0724b5b83026ee19a9d46d41df