Merge "[SettingsProvider] fix font size scale validator" into rvc-qpr-dev am: 190d57124c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1128b7d83276669de4550479db14056fa179eb63