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

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

Change-Id: I3990c05d03edcc12e56e1839599dcc32e09b3fc0