Merge "Set the settings key when the font size is changed" into tm-qpr-dev am: 91eab671

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



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