Merge "fix(non linear font scaling)!: add ComplexDimensionUnit annotation to...

Merge "fix(non linear font scaling)!: add ComplexDimensionUnit annotation to setLineHeight()" into udc-dev am: 8f9bb97f am: 646061a7

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



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