Merge "Fix the toggle button flicker problem when display" into sc-dev am:...

Merge "Fix the toggle button flicker problem when display" into sc-dev am: c0b23b03 am: bf2fae3d am: ef95465d

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

Change-Id: I422b3fbdaa960e8708deb87fcbbf3bf9d0fe2d35