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

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

am skip reason: Merged-In Ic0ca23142e2c710400a936d4f1030ec30f736a35 with SHA-1 d40cef3e is already in history

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



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