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: 68d7e80b

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



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