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: 49d52d14 am: 4d410546

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

Change-Id: I9b215e243f6c48e4d1b438ff82defe4d719e59e0