[Provider Model] Fix the overlap when changing the font/display size Bug: 211540142 Test: manual Change-Id: I10032a866ee05030070b40076fa946c3e73e0d56 (cherry picked from commit 4b28a9a63cc807226de48cc4e33f79f438e3d367) Merged-In:I10032a866ee05030070b40076fa946c3e73e0d56