Merge "Fix the flickering on display/font size page" into sc-dev am: 11c602bdf2
am: d33c3c4886
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15233450 Change-Id: I67ebe7dbca94a72e6337aa1725bd08e317e15efd
This commit is contained in: