Merge "Check lineHeight without cast" into udc-dev am: cd819a4a am: 0576bcda am: ee5ebe3e

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



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