Merge "Fix the overlapping problem of the burst of slice updates" into rvc-dev...

Merge "Fix the overlapping problem of the burst of slice updates" into rvc-dev am: 251b9849 am: 2de51f92

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

Change-Id: I17ccb0c8684afdd21e3e953c51e1a120a2ff4f03