Merge "[Provider Model] Fix the overlap when changing the font/display size" into sc-v2-dev am: f2d1f344bd am: d6a0dbe9a4

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

Change-Id: I8c5c1e344b3f75ceafb0be2b2a59ba892969ce62