Merge "[automerger skipped] [Provider Model] Fix the overlap when changing the font/display size am: 941c4a4af0 -s ours" am: 53afae201c -s ours am: b501a1bac3 -s ours am: 730b3cca8a -s ours

am skip reason: Merged-In I10032a866ee05030070b40076fa946c3e73e0d56 with SHA-1 10925e6bf5 is already in history

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

Change-Id: Ib0deec14db8d0dc8a40ecc9698b659a6b4d85157