Merge "fix(non linear font scaling): qs customizer page tile height is not scaling with font size" into udc-dev am: 716fe59bc1 am: c194606e9f

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

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