Merge "fix(non linear font scaling): qs customizer page tile height is not...

Merge "fix(non linear font scaling): qs customizer page tile height is not scaling with font size" into udc-dev am: 716fe59b am: c194606e am: 96bc3ed9 am: a19c4c41

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



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