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

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



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