[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: 3cd7740b -s ours

am skip reason: Merged-In I692209035332bfd463537988f4e3ce166414031e with SHA-1 c0b8f62b is already in history

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

Change-Id: Idf58bd6a692b2017681c22355c74c3e94039829e