Merge changes from topic "sysui-typography" into tm-qpr-dev am: d964925ed8

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

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