Merge "Fix font in miniresolver headline" into tm-qpr-dev am: ccf0a674 am:...

Merge "Fix font in miniresolver headline" into tm-qpr-dev am: ccf0a674 am: 222264c6 am: 4b1fa406 am: 44b92ca9

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



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