Merge "[SettingsProvider] fix font size scale validator" into rvc-dev am: 9431e05686

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b35352429798e8a7197a713d1fa548e1a434f62