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: Iaa14c89b1940432014008243530476775c0ac6b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>