[automerger skipped] [Provider Model] Fix the overlap when changing the...

[automerger skipped] [Provider Model] Fix the overlap when changing the font/display size am: 941c4a4a -s ours am: f293ba95 -s ours am: 1b39709d -s ours

am skip reason: Merged-In I10032a866ee05030070b40076fa946c3e73e0d56 with SHA-1 4b28a9a6 is already in history

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

Change-Id: I9491326552ad25b8d2f77fef8ada4564d361989f