[automerger skipped] Merge "The UI is not immediately updated" into sc-dev am:...

[automerger skipped] Merge "The UI is not immediately updated" into sc-dev am: e7515466 am: 31479278 -s ours

am skip reason: Change-Id I692209035332bfd463537988f4e3ce166414031e with SHA-1 59958e66 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied8fb56d003fcdcc26abaa61a2d34d7ee4a9e770