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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I88307fb89097c8098cc3fb6cf1de71627f29be72