[automerger skipped] [Provider Model] Fix the overlap when changing the font/display size am: 941c4a4af0 -s ours am: 1df9c88a0b -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: I8c8ed373d337ba6bbcb14de7df1bfc662ebebbfb
This commit is contained in: