Merge "Merge "Check lineHeight without cast" into udc-dev am: cd819a4a am:...

Merge "Merge "Check lineHeight without cast" into udc-dev am: cd819a4a am: 988c5d67" into udc-d1-dev-plus-aosp am: 63534567

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



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