[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: 1df9c88a -s ours am: aee77bdc -s ours am: 993e2ec4 -s ours am: c0111cc0 -s ours

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

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

Change-Id: I4cd9b6d9f2fd2e81650eb21a6bf073d9bd462256