fix(non linear font scaling): preserve proportionality of lineHeight when...

fix(non linear font scaling): preserve proportionality of lineHeight when non-linear font scaling is in effect am: a4d59758 am: 22f3a5c7

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



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