Merge "The UI is not immediately updated" into sc-dev am: e7515466ea

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1b2809f8dd0ba768f1b70384123206d2ef952ec