Merge "fix(non linear font scaling): restore font scale to default instead of...

Merge "fix(non linear font scaling): restore font scale to default instead of original" into udc-dev am: 887a8ffd

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



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