[automerger skipped] Merge "Move font size related resources to SettingsLib...

[automerger skipped] Merge "Move font size related resources to SettingsLib (1/2)" into tm-qpr-dev am: b0087167 am: 4eea038c -s ours

am skip reason: Merged-In If630bd9c9c27823c210410b53342b921a11bbfb9 with SHA-1 44ebe53c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21312036



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