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

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



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