Merge "Fix suw display size flicker problem" into sc-v2-dev am: 943d68127c am: 579723b4b4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16234666

Change-Id: I4454ecfdf367df1c47ac2412d2d75019342d887d