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 am: 5751ff39

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



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