Merge "Move font size related resources to SettingsLib (2/2)" into tm-qpr-dev am: efe52d28

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



Change-Id: I2b0d16ab5b38647624fac1dadf4da8e0bf0e2c17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>