Merge changes from topics "fontscaling-lineheight-after",...

Merge changes from topics "fontscaling-lineheight-after", "fontscaling-lineheight-spfix" into udc-dev am: 48e1f12c am: 27ca8a1b

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



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