Merge "Set the settings key when the font size is changed" into udc-dev am:...

Merge "Set the settings key when the font size is changed" into udc-dev am: 0290fb1c am: 99a0e22d

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



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