Merge "fix(non linear font scaling): add a setLineHeight() that accepts...

Merge "fix(non linear font scaling): add a setLineHeight() that accepts explicit units." into udc-dev am: 1c42936d am: bf8b0837

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



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