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

Merge "[automerger skipped] [Provider Model] Fix the overlap when changing the font/display size am: 941c4a4a -s ours" am: 53afae20 -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: I78ac5e3a80f31f5964a370ae53dbc9d7d139c8c2