[automerger skipped] Merge "Set the settings key when the font size is...

[automerger skipped] Merge "Set the settings key when the font size is changed" into tm-qpr-dev am: 91eab671 am: 934beb41 -s ours

am skip reason: Merged-In I382e4ecd3c335d7b046f157cedc093fc40c3a77a with SHA-1 dbaea0f1 is already in history

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



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