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

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

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



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