Merge "Fix force close for updating UI after activity destroyed." into main am: c3ea626cd3 am: 5c3479b265

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

Change-Id: Ifa9536dd3bc78759b0d74b8c588fea86a60e3d16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>